openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2022
- 1 participants
- 2423 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000product for openSUSE:Factory checked in at 2022-11-30 21:20:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000product (Old)
and /work/SRC/openSUSE:Factory/.000product.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000product"
Wed Nov 30 21:20:36 2022 rev:3420 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MicroOS-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:41.535074379 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:41.543074420 +0100
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20221129" schemaversion="4.1">
+<image name="OBS__MicroOS___20221130" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20221129</productvar>
+ <productvar name="VERSION">20221130</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:microos:20221129,openSUSE MicroOS</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:microos:20221130,openSUSE MicroOS</productinfo>
<productinfo name="LINGUAS">en_US </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20221129/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20221130/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:41.571074567 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:41.575074588 +0100
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Addon-NonOss___20221129" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20221130" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -36,11 +36,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20221129</productvar>
+ <productvar name="VERSION">20221130</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20221129,openSUSE NonOSS Addon</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20221130,openSUSE NonOSS Addon</productinfo>
<productinfo name="LINGUAS">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 </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022…</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022…</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-cd-mini-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:41.599074713 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:41.603074734 +0100
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20221129" schemaversion="4.1">
+<image name="OBS__openSUSE___20221130" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -32,11 +32,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20221129</productvar>
+ <productvar name="VERSION">20221130</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221129,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221130,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221129/i586</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/i586</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-cd-mini-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:41.623074838 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:41.627074859 +0100
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20221129" schemaversion="4.1">
+<image name="OBS__openSUSE___20221130" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20221129</productvar>
+ <productvar name="VERSION">20221130</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221129,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221130,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221129/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-dvd5-dvd-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:41.647074964 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:41.651074985 +0100
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20221129" schemaversion="4.1">
+<image name="OBS__openSUSE___20221130" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -32,11 +32,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20221129</productvar>
+ <productvar name="VERSION">20221130</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221129,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221130,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221129/i586</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/i586</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:41.675075110 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:41.679075131 +0100
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20221129" schemaversion="4.1">
+<image name="OBS__openSUSE___20221130" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20221129</productvar>
+ <productvar name="VERSION">20221130</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221129,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221130,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221129/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:41.699075236 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:41.703075257 +0100
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20221129" schemaversion="4.1">
+<image name="OBS__openSUSE___20221130" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -24,7 +24,7 @@
<productvar name="DISTNAME">openSUSE</productvar>
<productvar name="FLAVOR">ftp</productvar>
<productvar name="MAKE_LISTINGS">true</productvar>
- <productvar name="MEDIUM_NAME">openSUSE-20221129-i586-x86_64</productvar>
+ <productvar name="MEDIUM_NAME">openSUSE-20221130-i586-x86_64</productvar>
<productvar name="MULTIPLE_MEDIA">true</productvar>
<productvar name="PRODUCT_DIR">/</productvar>
<productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -36,11 +36,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20221129</productvar>
+ <productvar name="VERSION">20221130</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221129,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20221130,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221129/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221129/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20221130/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="DEBUGMEDIUM">2</productoption>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ MicroOS.product ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:41.751075507 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:41.755075528 +0100
@@ -6,7 +6,7 @@
<name>MicroOS</name>
<releasepkgname>MicroOS-release</releasepkgname>
<endoflife/>
- <version>20221129</version>
+ <version>20221130</version>
<!-- release is no longer optional -->
<release>0</release>
<productline>MicroOS</productline>
++++++ dvd.group ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:41.867076113 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:41.875076155 +0100
@@ -103,15 +103,15 @@
<package name="akregator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="akregator-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="alpine" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
- <package name="alsa" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+ <package name="alsa" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
<package name="alsa-firmware" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
- <package name="alsa-oss" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
- <package name="alsa-plugins" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+ <package name="alsa-oss" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+ <package name="alsa-plugins" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
<package name="alsa-plugins-pulse" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
- <package name="alsa-plugins-speexrate" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
- <package name="alsa-plugins-upmix" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
- <package name="alsa-ucm-conf" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
- <package name="alsa-utils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+ <package name="alsa-plugins-speexrate" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+ <package name="alsa-plugins-upmix" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+ <package name="alsa-ucm-conf" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+ <package name="alsa-utils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
<package name="alts" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
<package name="amarok" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
<package name="amavisd-milter" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
@@ -246,7 +246,7 @@
<package name="busybox-bzip2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
<package name="busybox-coreutils" supportstatus="unsupported"/> <!-- reason: dvd:grub2-systemd-sleep-plugin -->
<package name="busybox-ed" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
- <package name="busybox-findutils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_yast -->
+ <package name="busybox-findutils" supportstatus="unsupported"/> <!-- reason: dvd:grub2-branding-openSUSE -->
<package name="busybox-gawk" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
<package name="busybox-grep" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
<package name="busybox-gzip" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
@@ -374,8 +374,8 @@
<package name="dhcp" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
<package name="dhcp-relay" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
<package name="dhcp-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
- <package name="dialog" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
- <package name="dialog-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+ <package name="dialog" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+ <package name="dialog-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
<package name="diffutils" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
<package name="diffutils-lang" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
<package name="ding" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
@@ -1638,7 +1638,7 @@
<package name="libatkmm-1_6-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
<package name="libatm1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
<package name="libatomic1" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
- <package name="libatopology2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+ <package name="libatopology2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
<package name="libatspi0" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
<package name="libattr1" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
<package name="libaudit1" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
@@ -1808,7 +1808,7 @@
<package name="libdevmapper-event1_03" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
<package name="libdevmapper1_03" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
<package name="libdhash1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
- <package name="libdialog15" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+ <package name="libdialog15" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
<package name="libdiscid0" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
<package name="libdjvulibre21" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libdlm" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
@@ -4798,7 +4798,7 @@
<package name="yast2-slp" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
<package name="yast2-slp-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
<package name="yast2-snapper" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
- <package name="yast2-sound" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+ <package name="yast2-sound" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
<package name="yast2-squid" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
<package name="yast2-storage-ng" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
<package name="yast2-sudo" supportstatus="unsupported"/> <!-- reason: dvd:patterns-yast-yast2_server -->
++++++ openSUSE-Addon-NonOss.product ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:41.895076260 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:41.899076280 +0100
@@ -4,7 +4,7 @@
<product>
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
- <version>20221129</version>
+ <version>20221130</version>
<release>0</release>
<summary>openSUSE NonOSS Addon</summary>
<shortsummary>non oss addon</shortsummary>
++++++ openSUSE.product ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:41.923076406 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:41.927076427 +0100
@@ -4,7 +4,7 @@
<product>
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20221129</version>
+ <version>20221130</version>
<release>0</release>
<productline>openSUSE</productline>
++++++ unsorted.yml ++++++
--- /var/tmp/diff_new_pack.dYIVcd/_old 2022-11-30 21:20:42.023076928 +0100
+++ /var/tmp/diff_new_pack.dYIVcd/_new 2022-11-30 21:20:42.031076970 +0100
@@ -783,6 +783,10 @@
- armadillo-devel-32bit: [x86_64]
- armadillo-doc
- armagetron
+ - armnn: [x86_64]
+ - armnn-devel: [x86_64]
+ - armnn-opencl: [x86_64]
+ - armnn-opencl-devel: [x86_64]
- arp-scan
- arpack-ng-devel
- arpack-ng-devel-32bit: [x86_64]
@@ -9847,6 +9851,16 @@
- libarm_compute_graph29: [x86_64]
- libarmadillo11
- libarmadillo11-32bit: [x86_64]
+ - libarmnn31: [x86_64]
+ - libarmnn31-opencl: [x86_64]
+ - libarmnnBasePipeServer31: [x86_64]
+ - libarmnnBasePipeServer31-opencl: [x86_64]
+ - libarmnnSerializer31: [x86_64]
+ - libarmnnSerializer31-opencl: [x86_64]
+ - libarmnnTestUtils2: [x86_64]
+ - libarmnnTestUtils2-opencl: [x86_64]
+ - libarmnnTfLiteParser24: [x86_64]
+ - libarmnnTfLiteParser24-opencl: [x86_64]
- libarpack2
- libarpack2-32bit: [x86_64]
- libarprec0
@@ -14454,6 +14468,10 @@
- libtiff-devel
- libtiff-devel-32bit: [x86_64]
- libtiled1
+ - libtimelineDecoder31: [x86_64]
+ - libtimelineDecoder31-opencl: [x86_64]
+ - libtimelineDecoderJson31: [x86_64]
+ - libtimelineDecoderJson31-opencl: [x86_64]
- libtimezonemap1
- libtimidity-devel
- libtimidity2
@@ -43403,6 +43421,8 @@
- ubuntu-mate-icon-theme
- ubuntu-mate-wallpapers
- ubuntu-mono-icon-theme
+ - ucblogo
+ - ucblogo-doc
- uchardet
- ucl-devel
- ucm
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2022-11-30 21:20:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Wed Nov 30 21:20:34 2022 rev:1966 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
openSUSE-Addon-NonOss-release.spec: same change
openSUSE-release.spec: same change
stub.spec: same change
++++++ weakremovers.inc ++++++
--- /var/tmp/diff_new_pack.i4MENc/_old 2022-11-30 21:20:37.331052412 +0100
+++ /var/tmp/diff_new_pack.i4MENc/_new 2022-11-30 21:20:37.339052454 +0100
@@ -29491,11 +29491,7 @@
Provides: weakremover(alsa-plugins-32bit)
Provides: weakremover(anthy-32bit)
Provides: weakremover(arm-ml-examples)
-Provides: weakremover(armnn)
-Provides: weakremover(armnn-devel)
Provides: weakremover(armnn-extratests)
-Provides: weakremover(armnn-opencl)
-Provides: weakremover(armnn-opencl-devel)
Provides: weakremover(armnn-opencl-extratests)
Provides: weakremover(arts-32bit)
Provides: weakremover(atk-devel-32bit)
@@ -30350,8 +30346,6 @@
Provides: weakremover(libarmnnTfLiteParser22-opencl)
Provides: weakremover(libarmnnTfLiteParser23)
Provides: weakremover(libarmnnTfLiteParser23-opencl)
-Provides: weakremover(libarmnnTfLiteParser24)
-Provides: weakremover(libarmnnTfLiteParser24-opencl)
Provides: weakremover(libarmnnTfParser19)
Provides: weakremover(libarmnnTfParser19-opencl)
Provides: weakremover(libarmnnTfParser20)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2022-11-30 21:17:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000update-repos (Old)
and /work/SRC/openSUSE:Factory/.000update-repos.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000update-repos"
Wed Nov 30 21:17:39 2022 rev:2153 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
factory:non-oss_3419.1.packages.zst
factory_20221129.packages.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package otpclient for openSUSE:Factory checked in at 2022-11-30 18:53:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/otpclient (Old)
and /work/SRC/openSUSE:Factory/.otpclient.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "otpclient"
Wed Nov 30 18:53:49 2022 rev:18 rq:1039157 version:2.6.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/otpclient/otpclient.changes 2022-07-21 11:33:55.754979445 +0200
+++ /work/SRC/openSUSE:Factory/.otpclient.new.1597/otpclient.changes 2022-11-30 18:53:51.740680940 +0100
@@ -1,0 +2,6 @@
+Wed Nov 30 16:31:09 UTC 2022 - Paolo Stivanin <info(a)paolostivanin.com>
+
+- Update to 2.6.4:
+ * fix issue when importing AEGIS encrypted backups.
+
+-------------------------------------------------------------------
Old:
----
v2.6.3.tar.gz
v2.6.3.tar.gz.asc
New:
----
otpclient.keyring
v2.6.4.tar.gz
v2.6.4.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ otpclient.spec ++++++
--- /var/tmp/diff_new_pack.oHMmiF/_old 2022-11-30 18:53:52.376684528 +0100
+++ /var/tmp/diff_new_pack.oHMmiF/_new 2022-11-30 18:53:52.400684663 +0100
@@ -18,7 +18,7 @@
%define uclname OTPClient
Name: otpclient
-Version: 2.6.3
+Version: 2.6.4
Release: 0
Summary: Simple GTK+ client for managing TOTP and HOTP
License: GPL-3.0-or-later
@@ -26,6 +26,7 @@
URL: https://github.com/paolostivanin/%{name}
Source0: https://github.com/paolostivanin/%{name}/archive/v%{version}.tar.gz
Source1: https://github.com/paolostivanin/%{uclname}/releases/download/v%{version}/v…
+Source2: otpclient.keyring
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
++++++ v2.6.3.tar.gz -> v2.6.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.6.3/CMakeLists.txt new/OTPClient-2.6.4/CMakeLists.txt
--- old/OTPClient-2.6.3/CMakeLists.txt 2022-07-20 08:27:18.000000000 +0200
+++ new/OTPClient-2.6.4/CMakeLists.txt 2022-11-30 17:07:46.000000000 +0100
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10)
-project(OTPClient VERSION "2.6.3" LANGUAGES "C")
+project(OTPClient VERSION "2.6.4" LANGUAGES "C")
configure_file("src/common/version.h.in" "version.h")
include_directories(${PROJECT_BINARY_DIR})
@@ -44,7 +44,7 @@
pkg_check_modules(BASEENCODE REQUIRED baseencode>=1.0.12)
pkg_check_modules(PNG REQUIRED libpng>=1.2.0)
pkg_check_modules(LIBZIP REQUIRED libzip>=1.0.0)
-pkg_check_modules(JANSSON REQUIRED jansson>=2.6.0)
+pkg_check_modules(JANSSON REQUIRED jansson>=2.10.0)
pkg_check_modules(ZBAR REQUIRED zbar>=0.20)
pkg_check_modules(GTK3 REQUIRED gtk+-3.0>=3.20.0)
pkg_check_modules(GLIB2 REQUIRED glib-2.0>=2.48.0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.6.3/README.md new/OTPClient-2.6.4/README.md
--- old/OTPClient-2.6.3/README.md 2022-07-20 08:27:18.000000000 +0200
+++ new/OTPClient-2.6.4/README.md 2022-11-30 17:07:46.000000000 +0100
@@ -10,7 +10,7 @@
|----------------------------------------------------|-------------|
| GTK+ | 3.20 |
| Glib | 2.48.0 |
-| jansson | 2.100 |
+| jansson | 2.10 |
| libgcrypt | 1.6.0 |
| libzip | 1.0.0 |
| libpng | 1.2.0 |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.6.3/SECURITY.md new/OTPClient-2.6.4/SECURITY.md
--- old/OTPClient-2.6.3/SECURITY.md 2022-07-20 08:27:18.000000000 +0200
+++ new/OTPClient-2.6.4/SECURITY.md 2022-11-30 17:07:46.000000000 +0100
@@ -7,7 +7,7 @@
| Version | Supported | EOL |
| ------- | ------------------ |-------------|
| 2.6.x | :heavy_check_mark: | - |
-| 2.5.x | :heavy_check_mark: | 30-Sep-2022 |
+| 2.5.x | :x: | 31-Aug-2022 |
| 2.4.x | :x: | 15-May-2022 |
| 2.3.x | :x: | 28-Feb-2021 |
| 2.2.x | :x: | 27-May-2020 |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.6.3/data/com.github.paolostivanin.OTPClient.appdata.xml new/OTPClient-2.6.4/data/com.github.paolostivanin.OTPClient.appdata.xml
--- old/OTPClient-2.6.3/data/com.github.paolostivanin.OTPClient.appdata.xml 2022-07-20 08:27:18.000000000 +0200
+++ new/OTPClient-2.6.4/data/com.github.paolostivanin.OTPClient.appdata.xml 2022-11-30 17:07:46.000000000 +0100
@@ -83,6 +83,14 @@
</content_rating>
<releases>
+ <release version="2.6.4" date="2022-11-30">
+ <description>
+ <p>OTPClient 2.6.4 fixes an import issue</p>
+ <ul>
+ <li>fix issue when importing encrypted AEGIS backup.</li>
+ </ul>
+ </description>
+ </release>
<release version="2.6.3" date="2022-07-20">
<description>
<p>OTPClient 2.6.3 fixes an issue when setting the migration flag</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.6.3/src/cli/get-data.c new/OTPClient-2.6.4/src/cli/get-data.c
--- old/OTPClient-2.6.3/src/cli/get-data.c 2022-07-20 08:27:18.000000000 +0200
+++ new/OTPClient-2.6.4/src/cli/get-data.c 2022-11-30 17:07:46.000000000 +0100
@@ -94,12 +94,12 @@
cotp_error_t cotp_err;
const gchar *issuer = json_string_value (json_object_get (obj, "issuer"));
const gchar *secret = json_string_value (json_object_get (obj, "secret"));
- gint digits = json_integer_value (json_object_get (obj, "digits"));
+ gint digits = (gint)json_integer_value (json_object_get (obj, "digits"));
gint algo = get_algo_int_from_str (json_string_value (json_object_get (obj, "algo")));
gint period;
gint64 counter;
if (g_ascii_strcasecmp (json_string_value (json_object_get (obj, "type")), "TOTP") == 0) {
- period = json_integer_value (json_object_get (obj, "period"));
+ period = (gint)json_integer_value (json_object_get (obj, "period"));
gint remaining_seconds = (period > 59 ? 119 : 59) - g_date_time_get_second (g_date_time_new_now_local());
gint token_validity = remaining_seconds % period;
glong current_ts = time(NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.6.3/src/common/aegis.c new/OTPClient-2.6.4/src/common/aegis.c
--- old/OTPClient-2.6.3/src/common/aegis.c 2022-07-20 08:27:18.000000000 +0200
+++ new/OTPClient-2.6.4/src/common/aegis.c 2022-11-30 17:07:46.000000000 +0100
@@ -38,7 +38,7 @@
return NULL;
}
- return encrypted == TRUE ? get_otps_from_encrypted_backup(path, password, max_file_size, err) : get_otps_from_plain_backup(path, err);
+ return (encrypted == TRUE) ? get_otps_from_encrypted_backup(path, password, max_file_size, err) : get_otps_from_plain_backup(path, err);
}
@@ -139,7 +139,7 @@
gcry_free (master_key);
return NULL;
}
- gchar *decrypted_db = g_malloc0 (out_len);
+ gchar *decrypted_db = gcry_calloc_secure (out_len, 1);
gcry_cipher_decrypt (hd, decrypted_db, out_len, b64decoded_db, out_len);
gpg_err = gcry_cipher_checktag(hd, tag, TAG_SIZE);
if (gpg_err != 0) {
@@ -157,8 +157,7 @@
gcry_free (master_key);
GSList *otps = parse_json_data (decrypted_db, err);
-
- g_free (decrypted_db);
+ gcry_free (decrypted_db);
return otps;
}
@@ -350,7 +349,7 @@
g_set_error (err, generic_error_gquark (), GENERIC_ERRCODE, "%s", jerr.text);
return NULL;
}
- json_t *array = json_object_get(json_object_get(root, "db"), "entries");
+ json_t *array = json_object_get(root, "entries");
if (array == NULL) {
g_set_error (err, generic_error_gquark (), GENERIC_ERRCODE, "%s", jerr.text);
json_decref (root);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.6.3/src/edit-data.c new/OTPClient-2.6.4/src/edit-data.c
--- old/OTPClient-2.6.3/src/edit-data.c 2022-07-20 08:27:18.000000000 +0200
+++ new/OTPClient-2.6.4/src/edit-data.c 2022-11-30 17:07:46.000000000 +0100
@@ -13,11 +13,18 @@
DatabaseData *db_data;
} EditData;
-static void show_edit_dialog (EditData *edit_data, AppData *app_data, gchar *current_label, gchar *current_issuer);
-
-static gchar *get_parse_and_set_data_from_entries (EditData *edit_data, GtkWidget *new_lab_entry, GtkWidget *new_iss_entry);
-
-static void set_data_in_lstore_and_json (EditData *edit_data, const gchar *label, const gchar *issuer);
+static void show_edit_dialog (EditData *edit_data,
+ AppData *app_data,
+ gchar *current_label,
+ gchar *current_issuer);
+
+static gchar *get_parse_and_set_data_from_entries (EditData *edit_data,
+ GtkWidget *new_lab_entry,
+ GtkWidget *new_iss_entry);
+
+static void set_data_in_lstore_and_json (EditData *edit_data,
+ const gchar *label,
+ const gchar *issuer);
void
@@ -51,7 +58,10 @@
static void
-show_edit_dialog (EditData *edit_data, AppData *app_data, gchar *current_label, gchar *current_issuer)
+show_edit_dialog (EditData *edit_data,
+ AppData *app_data,
+ gchar *current_label,
+ gchar *current_issuer)
{
GtkBuilder *builder = get_builder_from_partial_path (UI_PARTIAL_PATH);
GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (builder, "edit_diag_id"));
@@ -102,7 +112,9 @@
static gchar *
-get_parse_and_set_data_from_entries (EditData *edit_data, GtkWidget *new_lab_entry, GtkWidget *new_iss_entry)
+get_parse_and_set_data_from_entries (EditData *edit_data,
+ GtkWidget *new_lab_entry,
+ GtkWidget *new_iss_entry)
{
const gchar *new_label = gtk_entry_get_text (GTK_ENTRY (new_lab_entry));
const gchar *new_issuer = gtk_entry_get_text (GTK_ENTRY (new_iss_entry));
@@ -122,7 +134,9 @@
static void
-set_data_in_lstore_and_json (EditData *edit_data, const gchar *label, const gchar *issuer)
+set_data_in_lstore_and_json (EditData *edit_data,
+ const gchar *label,
+ const gchar *issuer)
{
gtk_list_store_set (edit_data->list_store, &edit_data->iter,
COLUMN_ACC_LABEL, label,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.6.3/src/file-size.c new/OTPClient-2.6.4/src/file-size.c
--- old/OTPClient-2.6.3/src/file-size.c 2022-07-20 08:27:18.000000000 +0200
+++ new/OTPClient-2.6.4/src/file-size.c 2022-11-30 17:07:46.000000000 +0100
@@ -4,22 +4,17 @@
goffset
get_file_size (const gchar *file_path)
{
- GFileInfo *info;
- GFile *file;
GError *error = NULL;
- const gchar *attributes = "standard::*";
GFileQueryInfoFlags flags = G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS;
- GCancellable *cancellable = NULL;
- goffset file_size;
- file = g_file_new_for_path (file_path);
- info = g_file_query_info (G_FILE (file), attributes, flags, cancellable, &error);
+ GFile *file = g_file_new_for_path (file_path);
+ GFileInfo *info = g_file_query_info (G_FILE(file), "standard::*", flags, NULL, &error);
if (info == NULL) {
g_printerr ("%s\n", error->message);
g_clear_error (&error);
return -1;
}
- file_size = g_file_info_get_size (info);
+ goffset file_size = g_file_info_get_size (info);
g_object_unref (file);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.6.3/src/imports.c new/OTPClient-2.6.4/src/imports.c
--- old/OTPClient-2.6.3/src/imports.c 2022-07-20 08:27:18.000000000 +0200
+++ new/OTPClient-2.6.4/src/imports.c 2022-11-30 17:07:46.000000000 +0100
@@ -110,14 +110,18 @@
content = get_authplus_data (filename, pwd, app_data->db_data->max_file_size_from_memlock, &err);
} else if (g_strcmp0 (action_name, FREEOTPPLUS_IMPORT_ACTION_NAME) == 0) {
content = get_freeotpplus_data (filename, &err);
- } else if (g_strcmp0 (action_name, AEGIS_IMPORT_ACTION_NAME) == 0) {
+ } else if (g_strcmp0 (action_name, AEGIS_IMPORT_ACTION_NAME) == 0 || g_strcmp0 (action_name, AEGIS_IMPORT_ENC_ACTION_NAME) == 0) {
content = get_aegis_data (filename, pwd, app_data->db_data->max_file_size_from_memlock, g_strcmp0 (action_name, AEGIS_IMPORT_ENC_ACTION_NAME) == 0 ? TRUE : FALSE , &err);
}
- if (content == NULL && err != NULL) {
- gchar *msg = g_strconcat ("An error occurred while importing, so nothing has been added to the database. The error is:\n", err->message, NULL);
+ if (content == NULL) {
+ const gchar *msg = "An error occurred while importing, so nothing has been added to the database.";
+ gchar *msg_with_err = NULL;
+ if (err != NULL) {
+ msg_with_err = g_strconcat (msg, " The error is:\n", err->message, NULL);
+ }
show_message_dialog (app_data->main_window, msg, GTK_MESSAGE_ERROR);
- g_free (msg);
+ g_free (msg_with_err);
return FALSE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.6.3/src/lock-app.c new/OTPClient-2.6.4/src/lock-app.c
--- old/OTPClient-2.6.3/src/lock-app.c 2022-07-20 08:27:18.000000000 +0200
+++ new/OTPClient-2.6.4/src/lock-app.c 2022-11-30 17:07:46.000000000 +0100
@@ -106,7 +106,6 @@
GtkBindingSet *binding_set = gtk_binding_set_by_class (GTK_WIDGET_GET_CLASS (app_data->main_window));
gtk_binding_entry_add_signal (binding_set, GDK_KEY_l, GDK_CONTROL_MASK, "lock-app", 0);
- //const gchar *services[] = { "org.cinnamon.ScreenSaver", "org.freedesktop.ScreenSaver", "org.gnome.ScreenSaver", "com.canonical.Unity" };
const gchar *paths[] = { "/org/cinnamon/ScreenSaver", "/org/freedesktop/ScreenSaver", "/org/gnome/ScreenSaver", "/com/canonical/Unity/Session" };
const gchar *interfaces[] = { "org.cinnamon.ScreenSaver", "org.freedesktop.ScreenSaver", "org.gnome.ScreenSaver", "com.canonical.Unity.Session" };
const gchar *signal_names[] = { "ActiveChanged", "ActiveChanged", "ActiveChanged", "Locked" };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.6.3/src/ui/otpclient.ui new/OTPClient-2.6.4/src/ui/otpclient.ui
--- old/OTPClient-2.6.3/src/ui/otpclient.ui 2022-07-20 08:27:18.000000000 +0200
+++ new/OTPClient-2.6.4/src/ui/otpclient.ui 2022-11-30 17:07:46.000000000 +0100
@@ -1610,6 +1610,8 @@
<object class="GtkSwitch" id="notif_switch_id">
<property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left-attach">1</property>
@@ -1636,6 +1638,8 @@
<object class="GtkSwitch" id="nextotp_switch_id">
<property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left-attach">1</property>
@@ -1657,6 +1661,8 @@
<object class="GtkSwitch" id="autolock_switch_id">
<property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left-attach">1</property>
@@ -1709,6 +1715,8 @@
<object class="GtkSwitch" id="dark_theme_switch_id">
<property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left-attach">1</property>
@@ -1730,6 +1738,8 @@
<object class="GtkSwitch" id="disable_secret_service_switch_id">
<property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
</object>
<packing>
<property name="left-attach">1</property>
@@ -2182,7 +2192,6 @@
<object class="GtkLabel" id="info_bar_label_id">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes">label</property>
</object>
<packing>
<property name="expand">False</property>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-av for openSUSE:Factory checked in at 2022-11-30 18:53:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-av (Old)
and /work/SRC/openSUSE:Factory/.python-av.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-av"
Wed Nov 30 18:53:48 2022 rev:12 rq:1039152 version:10.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-av/python-av.changes 2022-08-15 20:00:43.845480117 +0200
+++ /work/SRC/openSUSE:Factory/.python-av.new.1597/python-av.changes 2022-11-30 18:53:50.460673720 +0100
@@ -1,0 +2,17 @@
+Wed Nov 30 13:43:36 UTC 2022 - Guillaume GARDET <guillaume.gardet(a)opensuse.org>
+
+- Update to 10.0.0:
+ * Add support for FFmpeg 5.0 and 5.1 (:issue:`817`).
+ * Drop support for FFmpeg < 4.3.
+ * Deprecate CodecContext.time_base for decoders (:issue:`966`).
+ * Deprecate VideoStream.framerate and VideoStream.rate (:issue:`1005`).
+ * Stop proxying Codec from Stream instances (:issue:`1037`).
+ * Add VideoFrame ndarray operations for gbrp formats (:issue:`986`).
+ * Add VideoFrame ndarray operations for gbrpf32 formats (:issue:`1028`).
+ * Add VideoFrame ndarray operations for nv12 format (:issue:`996`).
+ * Fix conversion to numpy array for multi-byte formats (:issue:`981`).
+ * Safely iterate over filter pads (:issue:`1000`).
+- Drop upstream patch:
+ * python-av-ffmpeg5-compatibility.patch
+
+-------------------------------------------------------------------
Old:
----
av-9.2.0.tar.gz
python-av-ffmpeg5-compatibility.patch
New:
----
av-10.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-av.spec ++++++
--- /var/tmp/diff_new_pack.UYP8B3/_old 2022-11-30 18:53:50.952676495 +0100
+++ /var/tmp/diff_new_pack.UYP8B3/_new 2022-11-30 18:53:50.956676518 +0100
@@ -19,14 +19,12 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-av
-Version: 9.2.0
+Version: 10.0.0
Release: 0
Summary: Python bindings for FFmpeg's libraries
License: BSD-3-Clause
URL: https://github.com/PyAV-Org/PyAV
Source: https://files.pythonhosted.org/packages/source/a/av/av-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM gh#PyAV-Org/PyAV#817 badshah400(a)gmail.com -- Add ffmpeg5 support, patch taken from upstream git
-Patch0: https://github.com/PyAV-Org/PyAV/commit/18704658487ea25e5202ac18438d836dfe6…
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module numpy}
++++++ av-9.2.0.tar.gz -> av-10.0.0.tar.gz ++++++
++++ 55057 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package terragrunt for openSUSE:Factory checked in at 2022-11-30 18:53:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/terragrunt (Old)
and /work/SRC/openSUSE:Factory/.terragrunt.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "terragrunt"
Wed Nov 30 18:53:46 2022 rev:20 rq:1039134 version:0.42.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/terragrunt/terragrunt.changes 2022-11-30 15:01:01.201724410 +0100
+++ /work/SRC/openSUSE:Factory/.terragrunt.new.1597/terragrunt.changes 2022-11-30 18:53:47.936659483 +0100
@@ -1,0 +2,13 @@
+Wed Nov 30 13:38:48 UTC 2022 - kastl(a)b1-systems.de
+
+- Update to version 0.42.2:
+ * Improve encryption setting on access log bucket (#2375)
+
+-------------------------------------------------------------------
+Wed Nov 30 13:20:21 UTC 2022 - kastl(a)b1-systems.de
+
+- Update to version 0.42.1:
+ * Feat(#2292) add accesslogging bucket tags property to remote state s3 config block (#2355)
+ * Update documentation to reference actions for S3 bucket configuration (#2366)
+
+-------------------------------------------------------------------
Old:
----
terragrunt-0.42.0.tar.gz
New:
----
terragrunt-0.42.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ terragrunt.spec ++++++
--- /var/tmp/diff_new_pack.Q1MAxx/_old 2022-11-30 18:53:49.100666049 +0100
+++ /var/tmp/diff_new_pack.Q1MAxx/_new 2022-11-30 18:53:49.104666071 +0100
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: terragrunt
-Version: 0.42.0
+Version: 0.42.2
Release: 0
Summary: Thin wrapper for Terraform for working with multiple Terraform modules
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Q1MAxx/_old 2022-11-30 18:53:49.188666545 +0100
+++ /var/tmp/diff_new_pack.Q1MAxx/_new 2022-11-30 18:53:49.192666568 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/gruntwork-io/terragrunt</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.42.0</param>
+ <param name="revision">v0.42.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
@@ -16,7 +16,7 @@
<param name="compression">gz</param>
</service>
<service name="go_modules" mode="disabled">
- <param name="archive">terragrunt-0.42.0.tar.gz</param>
+ <param name="archive">terragrunt-0.42.2.tar.gz</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.Q1MAxx/_old 2022-11-30 18:53:49.216666703 +0100
+++ /var/tmp/diff_new_pack.Q1MAxx/_new 2022-11-30 18:53:49.220666725 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/gruntwork-io/terragrunt</param>
- <param name="changesrevision">d9eca946aa272ff0d99a34d26138abdea32ab2ff</param></service></servicedata>
+ <param name="changesrevision">f7dcb4a262f58628909f8264c98abb3f2a4305aa</param></service></servicedata>
(No newline at EOF)
++++++ terragrunt-0.42.0.tar.gz -> terragrunt-0.42.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/config/config_helpers_test.go new/terragrunt-0.42.2/config/config_helpers_test.go
--- old/terragrunt-0.42.0/config/config_helpers_test.go 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/config/config_helpers_test.go 2022-11-29 19:16:54.000000000 +0100
@@ -877,6 +877,16 @@
configMap["s3_bucket_tags"].(map[string]interface{}),
map[string]interface{}{"owner": "terragrunt integration test", "name": "Terraform state storage"},
)
+ assert.Equal(
+ t,
+ configMap["dynamodb_table_tags"].(map[string]interface{}),
+ map[string]interface{}{"owner": "terragrunt integration test", "name": "Terraform lock table"},
+ )
+ assert.Equal(
+ t,
+ configMap["accesslogging_bucket_tags"].(map[string]interface{}),
+ map[string]interface{}{"owner": "terragrunt integration test", "name": "Terraform access log storage"},
+ )
}
func TestReadTerragruntConfigHooks(t *testing.T) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/docs/README.md new/terragrunt-0.42.2/docs/README.md
--- old/terragrunt-0.42.0/docs/README.md 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/docs/README.md 2022-11-29 19:16:54.000000000 +0100
@@ -218,7 +218,7 @@
5. Add `index.html` file to newly create folder:
```
---
-layout: collection-browser # DO NOT CAHNGE THIS
+layout: collection-browser # DO NOT CHANGE THIS
title: Use cases
subtitle: Learn how to integrate Terragrunt with Terraform.
excerpt: Learn how to integrate Terragrunt with Terraform.
@@ -293,7 +293,7 @@
#### config.yml
-Collections are registred in the `_config.yml` file like other typical Jekyll collections.
+Collections are registered in the `_config.yml` file like other typical Jekyll collections.
Additional field used in the configuration is: `sort_by: order`. It ensures that collection's documents are displayed in the right order.
The `order` is set then in every collection document. For large collections it's recommended to split files into several folders, and then to use 3-digit numbers. So each folder would have reserved range of numbers, like: `100 - 199`, `200-299`, etc. It makes easy to add new documents without overwriting `order` fields in other docs.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/docs/_docs/02_features/aws-auth.md new/terragrunt-0.42.2/docs/_docs/02_features/aws-auth.md
--- old/terragrunt-0.42.0/docs/_docs/02_features/aws-auth.md 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/docs/_docs/02_features/aws-auth.md 2022-11-29 19:16:54.000000000 +0100
@@ -74,7 +74,11 @@
"s3:PutBucketVersioning",
"s3:PutEncryptionConfiguration",
"s3:PutBucketAcl",
- "s3:PutBucketLogging"
+ "s3:PutBucketLogging",
+ "s3:GetEncryptionConfiguration",
+ "s3:GetBucketPolicy",
+ "s3:GetBucketPublicAccessBlock",
+ "s3:PutLifecycleConfiguration"
],
"Resource": "arn:aws:s3:::BUCKET_NAME"
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/docs/_docs/02_features/keep-your-remote-state-configuration-dry.md new/terragrunt-0.42.2/docs/_docs/02_features/keep-your-remote-state-configuration-dry.md
--- old/terragrunt-0.42.0/docs/_docs/02_features/keep-your-remote-state-configuration-dry.md 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/docs/_docs/02_features/keep-your-remote-state-configuration-dry.md 2022-11-29 19:16:54.000000000 +0100
@@ -249,7 +249,7 @@
If you experience an error for any of these configurations, confirm you are using Terraform v0.12.2 or greater.
-Further, the config options `s3_bucket_tags`, `dynamodb_table_tags`, `skip_bucket_versioning`, `skip_bucket_ssencryption`, `skip_bucket_root_access`, `skip_bucket_enforced_tls`, `skip_bucket_public_access_blocking`, `accesslogging_bucket_name`, `accesslogging_target_prefix`, and `enable_lock_table_ssencryption` are only valid for backend `s3`. They are used by terragrunt and are **not** passed on to terraform. See section [Create remote state and locking resources automatically](#create-remote-state-and-locking-resources-automatically).
+Further, the config options `s3_bucket_tags`, `dynamodb_table_tags`, `accesslogging_bucket_tags`, `skip_bucket_versioning`, `skip_bucket_ssencryption`, `skip_bucket_root_access`, `skip_bucket_enforced_tls`, `skip_bucket_public_access_blocking`, `accesslogging_bucket_name`, `accesslogging_target_prefix`, and `enable_lock_table_ssencryption` are only valid for backend `s3`. They are used by terragrunt and are **not** passed on to terraform. See section [Create remote state and locking resources automatically](#create-remote-state-and-locking-resources-automatically).
### GCS-specific remote state settings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/docs/_docs/04_reference/config-blocks-and-attributes.md new/terragrunt-0.42.2/docs/_docs/04_reference/config-blocks-and-attributes.md
--- old/terragrunt-0.42.0/docs/_docs/04_reference/config-blocks-and-attributes.md 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/docs/_docs/04_reference/config-blocks-and-attributes.md 2022-11-29 19:16:54.000000000 +0100
@@ -392,6 +392,7 @@
- `enable_lock_table_ssencryption`: When `true`, the synchronization lock table in DynamoDB used for remote state concurrent access will not be configured with server side encryption.
- `s3_bucket_tags`: A map of key value pairs to associate as tags on the created S3 bucket.
- `dynamodb_table_tags`: A map of key value pairs to associate as tags on the created DynamoDB remote state lock table.
+- `accesslogging_bucket_tags`: A map of key value pairs to associate as tags on the created S3 bucket to store de access logs.
- `disable_aws_client_checksums`: When `true`, disable computing and checking checksums on the request and response,
such as the CRC32 check for DynamoDB. This can be used to workaround
https://github.com/gruntwork-io/terragrunt/issues/1059.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/docs/_docs/06_migration_guides/upgrading_to_terragrunt_0.19.x.md new/terragrunt-0.42.2/docs/_docs/06_migration_guides/upgrading_to_terragrunt_0.19.x.md
--- old/terragrunt-0.42.0/docs/_docs/06_migration_guides/upgrading_to_terragrunt_0.19.x.md 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/docs/_docs/06_migration_guides/upgrading_to_terragrunt_0.19.x.md 2022-11-29 19:16:54.000000000 +0100
@@ -256,6 +256,12 @@
owner = "terragrunt integration test"
name = "Terraform lock table"
}
+
+ # accesslogging_bucket_tags is an attribute, so an equals sign is REQUIRED
+ accesslogging_bucket_tags = {
+ owner = "terragrunt integration test"
+ name = "Terraform access log storage"
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/remote/remote_state_s3.go new/terragrunt-0.42.2/remote/remote_state_s3.go
--- old/terragrunt-0.42.0/remote/remote_state_s3.go 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/remote/remote_state_s3.go 2022-11-29 19:16:54.000000000 +0100
@@ -27,15 +27,17 @@
)
/*
- * We use this construct to separate the two config keys 's3_bucket_tags' and 'dynamodb_table_tags'
- * from the others, as they are specific to the s3 backend, but only used by terragrunt to tag
- * the s3 bucket and the dynamo db, in case it has to create them.
+ * We use this construct to separate the three config keys 's3_bucket_tags', 'dynamodb_table_tags'
+ * and 'accesslogging_bucket_tags' from the others, as they are specific to the s3 backend,
+ * but only used by terragrunt to tag the s3 bucket, the dynamo db and the s3 bucket used to the
+ * access logs, in case it has to create them.
*/
type ExtendedRemoteStateConfigS3 struct {
remoteStateConfigS3 RemoteStateConfigS3
S3BucketTags map[string]string `mapstructure:"s3_bucket_tags"`
DynamotableTags map[string]string `mapstructure:"dynamodb_table_tags"`
+ AccessLoggingBucketTags map[string]string `mapstructure:"accesslogging_bucket_tags"`
SkipBucketVersioning bool `mapstructure:"skip_bucket_versioning"`
SkipBucketSSEncryption bool `mapstructure:"skip_bucket_ssencryption"`
SkipBucketAccessLogging bool `mapstructure:"skip_bucket_accesslogging"`
@@ -56,6 +58,7 @@
var terragruntOnlyConfigs = []string{
"s3_bucket_tags",
"dynamodb_table_tags",
+ "accesslogging_bucket_tags",
"skip_bucket_versioning",
"skip_bucket_ssencryption",
"skip_bucket_accesslogging",
@@ -363,12 +366,6 @@
terragruntOptions.Logger.Warnf("Encryption is not enabled on the S3 remote state bucket %s. Terraform state files may contain secrets, so we STRONGLY recommend enabling encryption!", config.Bucket)
}
- if extendedConfig.AccessLoggingBucketName != "" && extendedConfig.BucketSSEAlgorithm != s3.ServerSideEncryptionAes256 {
- return errors.WithStackTrace(InvalidAccessLoggingBucketEncryption{
- BucketSSEAlgorithm: extendedConfig.BucketSSEAlgorithm,
- })
- }
-
return nil
}
@@ -438,7 +435,7 @@
if bucketUpdatesRequired.SSEEncryption {
if config.SkipBucketSSEncryption {
terragruntOptions.Logger.Debugf("Server-Side Encryption is disabled for the remote state AWS S3 bucket %s using 'skip_bucket_ssencryption' config.", config.remoteStateConfigS3.Bucket)
- } else if err := EnableSSEForS3BucketWide(s3Client, config.remoteStateConfigS3.Bucket, config, terragruntOptions); err != nil {
+ } else if err := EnableSSEForS3BucketWide(s3Client, config.remoteStateConfigS3.Bucket, fetchEncryptionAlgorithm(config), config, terragruntOptions); err != nil {
return err
}
}
@@ -479,8 +476,10 @@
return err
}
- if err := EnableSSEForS3BucketWide(s3Client, config.AccessLoggingBucketName, config, terragruntOptions); err != nil {
- return err
+ if !config.SkipBucketSSEncryption {
+ if err := EnableSSEForS3BucketWide(s3Client, config.AccessLoggingBucketName, s3.ServerSideEncryptionAes256, config, terragruntOptions); err != nil {
+ return err
+ }
}
if err := EnableEnforcedTLSAccesstoS3Bucket(s3Client, config.AccessLoggingBucketName, config, terragruntOptions); err != nil {
@@ -665,7 +664,7 @@
if config.SkipBucketSSEncryption {
terragruntOptions.Logger.Debugf("Server-Side Encryption is disabled for the remote state AWS S3 bucket %s using 'skip_bucket_ssencryption' config.", config.remoteStateConfigS3.Bucket)
- } else if err := EnableSSEForS3BucketWide(s3Client, config.remoteStateConfigS3.Bucket, config, terragruntOptions); err != nil {
+ } else if err := EnableSSEForS3BucketWide(s3Client, config.remoteStateConfigS3.Bucket, fetchEncryptionAlgorithm(config), config, terragruntOptions); err != nil {
return err
}
@@ -689,8 +688,10 @@
return err
}
- if err := EnableSSEForS3BucketWide(s3Client, config.AccessLoggingBucketName, config, terragruntOptions); err != nil {
- return err
+ if !config.SkipBucketSSEncryption {
+ if err := EnableSSEForS3BucketWide(s3Client, config.AccessLoggingBucketName, s3.ServerSideEncryptionAes256, config, terragruntOptions); err != nil {
+ return err
+ }
}
if err := EnableEnforcedTLSAccesstoS3Bucket(s3Client, config.AccessLoggingBucketName, config, terragruntOptions); err != nil {
@@ -700,6 +701,10 @@
terragruntOptions.Logger.Debugf("Access Logging is disabled for the remote state AWS S3 bucket %s", config.remoteStateConfigS3.Bucket)
}
+ if err := TagS3BucketAccessLogging(s3Client, config, terragruntOptions); err != nil {
+ return err
+ }
+
return nil
}
@@ -718,6 +723,34 @@
return nil
}
+func TagS3BucketAccessLogging(s3Client *s3.S3, config *ExtendedRemoteStateConfigS3, terragruntOptions *options.TerragruntOptions) error {
+
+ if config.AccessLoggingBucketTags == nil || len(config.AccessLoggingBucketTags) == 0 {
+ terragruntOptions.Logger.Debugf("No tags specified for bucket %s.", config.AccessLoggingBucketName)
+ return nil
+ }
+
+ // There must be one entry in the list
+ var tagsConverted = convertTags(config.AccessLoggingBucketTags)
+
+ terragruntOptions.Logger.Debugf("Tagging S3 bucket with %s", config.AccessLoggingBucketTags)
+
+ putBucketTaggingInput := s3.PutBucketTaggingInput{
+ Bucket: aws.String(config.AccessLoggingBucketName),
+ Tagging: &s3.Tagging{
+ TagSet: tagsConverted,
+ },
+ }
+
+ _, err := s3Client.PutBucketTagging(&putBucketTaggingInput)
+ if err != nil {
+ return errors.WithStackTrace(err)
+ }
+
+ terragruntOptions.Logger.Debugf("Tagged S3 bucket with %s", config.AccessLoggingBucketTags)
+ return nil
+}
+
func TagS3Bucket(s3Client *s3.S3, config *ExtendedRemoteStateConfigS3, terragruntOptions *options.TerragruntOptions) error {
if config.S3BucketTags == nil || len(config.S3BucketTags) == 0 {
@@ -1039,7 +1072,7 @@
}
// Enable bucket-wide Server-Side Encryption for the AWS S3 bucket specified in the given config
-func EnableSSEForS3BucketWide(s3Client *s3.S3, bucketName string, config *ExtendedRemoteStateConfigS3, terragruntOptions *options.TerragruntOptions) error {
+func EnableSSEForS3BucketWide(s3Client *s3.S3, bucketName string, algorithm string, config *ExtendedRemoteStateConfigS3, terragruntOptions *options.TerragruntOptions) error {
terragruntOptions.Logger.Debugf("Enabling bucket-wide SSE on AWS S3 bucket %s", bucketName)
accountID, err := aws_helper.GetAWSAccountID(config.GetAwsSessionConfig(), terragruntOptions)
@@ -1052,12 +1085,6 @@
return errors.WithStackTrace(err)
}
- // Encrypt with KMS by default
- algorithm := s3.ServerSideEncryptionAwsKms
- if config.BucketSSEAlgorithm != "" {
- algorithm = config.BucketSSEAlgorithm
- }
-
defEnc := &s3.ServerSideEncryptionByDefault{
SSEAlgorithm: aws.String(algorithm),
}
@@ -1082,6 +1109,15 @@
return nil
}
+func fetchEncryptionAlgorithm(config *ExtendedRemoteStateConfigS3) string {
+ // Encrypt with KMS by default
+ algorithm := s3.ServerSideEncryptionAwsKms
+ if config.BucketSSEAlgorithm != "" {
+ algorithm = config.BucketSSEAlgorithm
+ }
+ return algorithm
+}
+
func checkIfSSEForS3Enabled(s3Client *s3.S3, config *RemoteStateConfigS3, terragruntOptions *options.TerragruntOptions) (bool, error) {
terragruntOptions.Logger.Debugf("Checking if SSE is enabled for AWS S3 bucket %s", config.Bucket)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/remote/remote_state_s3_test.go new/terragrunt-0.42.2/remote/remote_state_s3_test.go
--- old/terragrunt-0.42.0/remote/remote_state_s3_test.go 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/remote/remote_state_s3_test.go 2022-11-29 19:16:54.000000000 +0100
@@ -79,6 +79,12 @@
true,
},
{
+ "equal-ignore-accesslogging-bucket-tags",
+ map[string]interface{}{"accesslogging_bucket_tags": []map[string]string{{"foo": "bar"}}},
+ &TerraformBackend{Type: "s3", Config: map[string]interface{}{}},
+ true,
+ },
+ {
"unequal-wrong-backend",
map[string]interface{}{"foo": "bar"},
&TerraformBackend{Type: "wrong", Config: map[string]interface{}{"foo": "bar"}},
@@ -274,6 +280,7 @@
map[string]interface{}{
"s3_bucket_tags": map[string]string{},
"dynamodb_table_tags": map[string]string{},
+ "accesslogging_bucket_tags": map[string]string{},
"skip_bucket_versioning": true,
"skip_bucket_ssencryption": false,
"skip_bucket_root_access": false,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/remote/remote_state_test.go new/terragrunt-0.42.2/remote/remote_state_test.go
--- old/terragrunt-0.42.0/remote/remote_state_test.go 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/remote/remote_state_test.go 2022-11-29 19:16:54.000000000 +0100
@@ -29,7 +29,12 @@
"dynamodb_table_tags": map[string]interface{}{
"team": "team name",
- "name": "Terraform state storage",
+ "name": "Terraform lock table",
+ "service": "Terraform"},
+
+ "accesslogging_bucket_tags": map[string]interface{}{
+ "team": "team name",
+ "name": "Terraform access log storage",
"service": "Terraform"},
"skip_bucket_versioning": true,
@@ -40,7 +45,7 @@
}
args := remoteState.ToTerraformInitArgs()
- // must not contain s3_bucket_tags or dynamodb_table_tags or skip_bucket_versioning
+ // must not contain s3_bucket_tags or dynamodb_table_tags or accesslogging_bucket_tags or skip_bucket_versioning
assertTerraformInitArgsEqual(t, args, "-backend-config=encrypt=true -backend-config=bucket=my-bucket -backend-config=key=terraform.tfstate -backend-config=region=us-east-1 -backend-config=force_path_style=true -backend-config=shared_credentials_file=my-file")
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/test/fixture/terragrunt.hcl new/terragrunt-0.42.2/test/fixture/terragrunt.hcl
--- old/terragrunt-0.42.0/test/fixture/terragrunt.hcl 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/test/fixture/terragrunt.hcl 2022-11-29 19:16:54.000000000 +0100
@@ -18,5 +18,10 @@
owner = "terragrunt integration test"
name = "Terraform lock table"
}
+
+ accesslogging_bucket_tags = {
+ owner = "terragrunt integration test"
+ name = "Terraform access log storage"
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/test/fixture-codegen/remote-state/s3/terragrunt.hcl new/terragrunt-0.42.2/test/fixture-codegen/remote-state/s3/terragrunt.hcl
--- old/terragrunt-0.42.0/test/fixture-codegen/remote-state/s3/terragrunt.hcl 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/test/fixture-codegen/remote-state/s3/terragrunt.hcl 2022-11-29 19:16:54.000000000 +0100
@@ -23,6 +23,11 @@
owner = "terragrunt integration test"
name = "Terraform lock table"
}
+
+ accesslogging_bucket_tags = {
+ owner = "terragrunt integration test"
+ name = "Terraform access log storage"
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/test/fixture-regressions/accesslogging-bucket/invlid-configuration/.gitignore new/terragrunt-0.42.2/test/fixture-regressions/accesslogging-bucket/invlid-configuration/.gitignore
--- old/terragrunt-0.42.0/test/fixture-regressions/accesslogging-bucket/invlid-configuration/.gitignore 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/test/fixture-regressions/accesslogging-bucket/invlid-configuration/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-backend.tf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/test/fixture-regressions/accesslogging-bucket/invlid-configuration/main.tf new/terragrunt-0.42.2/test/fixture-regressions/accesslogging-bucket/invlid-configuration/main.tf
--- old/terragrunt-0.42.0/test/fixture-regressions/accesslogging-bucket/invlid-configuration/main.tf 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/test/fixture-regressions/accesslogging-bucket/invlid-configuration/main.tf 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-resource "null_resource" "foo" {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/test/fixture-regressions/accesslogging-bucket/invlid-configuration/remote_terragrunt.hcl new/terragrunt-0.42.2/test/fixture-regressions/accesslogging-bucket/invlid-configuration/remote_terragrunt.hcl
--- old/terragrunt-0.42.0/test/fixture-regressions/accesslogging-bucket/invlid-configuration/remote_terragrunt.hcl 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/test/fixture-regressions/accesslogging-bucket/invlid-configuration/remote_terragrunt.hcl 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-# Configure Terragrunt to automatically store tfstate files in an S3 bucket
-remote_state {
- backend = "s3"
- generate = {
- path = "backend.tf"
- if_exists = "overwrite"
- }
- config = {
- encrypt = true
- bucket = "__FILL_IN_BUCKET_NAME__"
- key = "terraform.tfstate"
- region = "us-west-2"
- dynamodb_table = "__FILL_IN_LOCK_TABLE_NAME__"
- enable_lock_table_ssencryption = true
- accesslogging_bucket_name = "__FILL_IN_LOGS_BUCKET_NAME__"
- bucket_sse_algorithm = "aws:kms"
- }
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.42.0/test/integration_test.go new/terragrunt-0.42.2/test/integration_test.go
--- old/terragrunt-0.42.0/test/integration_test.go 2022-11-29 13:32:50.000000000 +0100
+++ new/terragrunt-0.42.2/test/integration_test.go 2022-11-29 19:16:54.000000000 +0100
@@ -657,32 +657,22 @@
targetLoggingBucket := terraws.GetS3BucketLoggingTarget(t, TERRAFORM_REMOTE_STATE_S3_REGION, s3BucketName)
targetLoggingBucketPrefix := terraws.GetS3BucketLoggingTargetPrefix(t, TERRAFORM_REMOTE_STATE_S3_REGION, s3BucketName)
+ encryptionConfig, err := bucketEncryption(t, TERRAFORM_REMOTE_STATE_S3_REGION, targetLoggingBucket)
+ assert.NoError(t, err)
+ assert.NotNil(t, encryptionConfig)
+ assert.NotNil(t, encryptionConfig.ServerSideEncryptionConfiguration)
+ for _, rule := range encryptionConfig.ServerSideEncryptionConfiguration.Rules {
+ if rule.ApplyServerSideEncryptionByDefault != nil {
+ if rule.ApplyServerSideEncryptionByDefault.SSEAlgorithm != nil {
+ assert.Equal(t, s3.ServerSideEncryptionAes256, *rule.ApplyServerSideEncryptionByDefault.SSEAlgorithm)
+ }
+ }
+ }
+
assert.Equal(t, s3BucketLogsName, targetLoggingBucket)
assert.Equal(t, remote.DefaultS3BucketAccessLoggingTargetPrefix, targetLoggingBucketPrefix)
}
-func TestTerragruntFailWithInvalidLoggingConfiguration(t *testing.T) {
- t.Parallel()
-
- examplePath := filepath.Join(TEST_FIXTURE_REGRESSIONS, "accesslogging-bucket/invlid-configuration")
- cleanupTerraformFolder(t, examplePath)
-
- s3BucketName := fmt.Sprintf("terragrunt-test-bucket-%s", strings.ToLower(uniqueId()))
- lockTableName := fmt.Sprintf("terragrunt-test-locks-%s", strings.ToLower(uniqueId()))
-
- tmpTerragruntConfigPath := createTmpTerragruntConfig(
- t,
- examplePath,
- s3BucketName,
- lockTableName,
- "remote_terragrunt.hcl",
- )
-
- _, _, err := runTerragruntCommandWithOutput(t, fmt.Sprintf("terragrunt validate --terragrunt-non-interactive --terragrunt-config %s --terragrunt-working-dir %s", tmpTerragruntConfigPath, examplePath))
- assert.Error(t, err)
- assert.Contains(t, err.Error(), s3.ServerSideEncryptionAes256)
-}
-
func TestTerragruntWorksWithGCSBackend(t *testing.T) {
t.Parallel()
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/terragrunt/vendor.tar.gz /work/SRC/openSUSE:Factory/.terragrunt.new.1597/vendor.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-azure-mgmt-devspaces for openSUSE:Factory checked in at 2022-11-30 17:40:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-azure-mgmt-devspaces (Old)
and /work/SRC/openSUSE:Factory/.python-azure-mgmt-devspaces.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-azure-mgmt-devspaces"
Wed Nov 30 17:40:44 2022 rev:6 rq:1039148 version:1.0.0b2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-azure-mgmt-devspaces/python-azure-mgmt-devspaces.changes 2021-06-15 16:37:55.117753926 +0200
+++ /work/SRC/openSUSE:Factory/.python-azure-mgmt-devspaces.new.1597/python-azure-mgmt-devspaces.changes 2022-11-30 17:40:44.220464068 +0100
@@ -1,0 +2,9 @@
+Thu Nov 24 17:58:17 UTC 2022 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- New upstream release
+ + Version 1.0.0b2
+ + For detailed information about changes see the
+ CHANGELOG.md file provided with this package
+- Update Requires from setup.py
+
+-------------------------------------------------------------------
Old:
----
azure-mgmt-devspaces-1.0.0b1.zip
New:
----
azure-mgmt-devspaces-1.0.0b2.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-azure-mgmt-devspaces.spec ++++++
--- /var/tmp/diff_new_pack.So2JEn/_old 2022-11-30 17:40:44.716466618 +0100
+++ /var/tmp/diff_new_pack.So2JEn/_new 2022-11-30 17:40:44.724466659 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-azure-mgmt-devspaces
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%define skip_python2 1
%endif
Name: python-azure-mgmt-devspaces
-Version: 1.0.0b1
+Version: 1.0.0b2
Release: 0
Summary: Microsoft Azure Dev Spaces Client Library
License: MIT
@@ -38,10 +38,11 @@
Requires: python-azure-common < 2.0.0
Requires: python-azure-common >= 1.1
Requires: python-azure-mgmt-core < 2.0.0
-Requires: python-azure-mgmt-core >= 1.2.0
+Requires: python-azure-mgmt-core >= 1.3.2
Requires: python-azure-mgmt-nspkg >= 3.0.0
Requires: python-azure-nspkg >= 3.0.0
-Requires: python-msrest >= 0.6.21
+Requires: python-msrest >= 0.7.1
+Requires: (python-typing_extensions >= 4.3.0 if python-base < 3.8)
Conflicts: python-azure-sdk <= 2.0.0
BuildArch: noarch
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-azure-mgmt-policyinsights for openSUSE:Factory checked in at 2022-11-30 17:40:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-azure-mgmt-policyinsights (Old)
and /work/SRC/openSUSE:Factory/.python-azure-mgmt-policyinsights.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-azure-mgmt-policyinsights"
Wed Nov 30 17:40:43 2022 rev:10 rq:1039147 version:1.1.0b3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-azure-mgmt-policyinsights/python-azure-mgmt-policyinsights.changes 2022-05-28 22:14:55.596792257 +0200
+++ /work/SRC/openSUSE:Factory/.python-azure-mgmt-policyinsights.new.1597/python-azure-mgmt-policyinsights.changes 2022-11-30 17:40:43.424459977 +0100
@@ -1,0 +2,9 @@
+Mon Nov 28 10:08:16 UTC 2022 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- New upstream release
+ + Version 1.1.0b3
+ + For detailed information about changes see the
+ CHANGELOG.md file provided with this package
+- Update Requires from setup.py
+
+-------------------------------------------------------------------
Old:
----
azure-mgmt-policyinsights-1.1.0b2.zip
New:
----
azure-mgmt-policyinsights-1.1.0b3.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-azure-mgmt-policyinsights.spec ++++++
--- /var/tmp/diff_new_pack.OeV2Ta/_old 2022-11-30 17:40:43.988462876 +0100
+++ /var/tmp/diff_new_pack.OeV2Ta/_new 2022-11-30 17:40:43.992462897 +0100
@@ -21,7 +21,7 @@
%define skip_python2 1
%endif
Name: python-azure-mgmt-policyinsights
-Version: 1.1.0b2
+Version: 1.1.0b3
Release: 0
Summary: Microsoft Azure Policy Insights Client Library
License: MIT
@@ -38,10 +38,10 @@
Requires: python-azure-common < 2.0.0
Requires: python-azure-common >= 1.1
Requires: python-azure-mgmt-core < 2.0.0
-Requires: python-azure-mgmt-core >= 1.2.0
+Requires: python-azure-mgmt-core >= 1.3.2
Requires: python-azure-mgmt-nspkg >= 3.0.0
Requires: python-azure-nspkg >= 3.0.0
-Requires: python-msrest >= 0.6.21
+Requires: python-msrest >= 0.7.1
Conflicts: python-azure-sdk <= 2.0.0
BuildArch: noarch
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cilium-cli for openSUSE:Factory checked in at 2022-11-30 16:58:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cilium-cli (Old)
and /work/SRC/openSUSE:Factory/.cilium-cli.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cilium-cli"
Wed Nov 30 16:58:31 2022 rev:22 rq:1039119 version:0.12.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/cilium-cli/cilium-cli.changes 2022-11-25 13:22:22.567427647 +0100
+++ /work/SRC/openSUSE:Factory/.cilium-cli.new.1597/cilium-cli.changes 2022-11-30 16:58:39.531581063 +0100
@@ -1,0 +2,17 @@
+Wed Nov 30 13:20:51 UTC 2022 - kastl(a)b1-systems.de
+
+- Update to version 0.12.10:
+ * Makefile: Fix potential uid/gid collision by using setpriv
+ * ci, make: allow to build release as root user
+ * Prepare for v0.12.10 release
+ * connectivity/check: fix logging in non-verbose mode with timestamps
+ * defaults: update connectivity test image versions
+ * connectivity: delete pods before deleting namespace
+ * install: delete connectivity test k8s resources before Cilium/Hubble
+ * .github/workflows: bump uninstall timeout on EKS
+ * clustermesh: Fix --bpf-lb-sock on < 1.12
+ * status: Exclude non-running pods from PodsCount
+ * connectivity: collect sysdump also on test setup failure
+ * build(deps): bump github.com/google/gops from 0.3.25 to 0.3.26
+
+-------------------------------------------------------------------
Old:
----
cilium-cli-0.12.9.tar.gz
New:
----
cilium-cli-0.12.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cilium-cli.spec ++++++
--- /var/tmp/diff_new_pack.kSCuV9/_old 2022-11-30 16:58:41.183589831 +0100
+++ /var/tmp/diff_new_pack.kSCuV9/_new 2022-11-30 16:58:41.191589873 +0100
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: cilium-cli
-Version: 0.12.9
+Version: 0.12.10
Release: 0
Summary: CLI to install, manage & troubleshoot Kubernetes clusters running Cilium
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.kSCuV9/_old 2022-11-30 16:58:41.235590107 +0100
+++ /var/tmp/diff_new_pack.kSCuV9/_new 2022-11-30 16:58:41.239590128 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/cilium/cilium-cli</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.12.9</param>
+ <param name="revision">v0.12.10</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
@@ -16,7 +16,7 @@
<param name="compression">gz</param>
</service>
<service name="go_modules" mode="disabled">
- <param name="archive">cilium-cli-0.12.9.tar.gz</param>
+ <param name="archive">cilium-cli-0.12.10.tar.gz</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.kSCuV9/_old 2022-11-30 16:58:41.271590297 +0100
+++ /var/tmp/diff_new_pack.kSCuV9/_new 2022-11-30 16:58:41.275590319 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/cilium/cilium-cli</param>
- <param name="changesrevision">1773634ea92e6a11aa34a851023f7ce9204a9c38</param></service></servicedata>
+ <param name="changesrevision">fada9d3dfd55b8a91dd8f7e9982d7d19def31e6d</param></service></servicedata>
(No newline at EOF)
++++++ cilium-cli-0.12.9.tar.gz -> cilium-cli-0.12.10.tar.gz ++++++
/work/SRC/openSUSE:Factory/cilium-cli/cilium-cli-0.12.9.tar.gz /work/SRC/openSUSE:Factory/.cilium-cli.new.1597/cilium-cli-0.12.10.tar.gz differ: char 13, line 1
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/cilium-cli/vendor.tar.gz /work/SRC/openSUSE:Factory/.cilium-cli.new.1597/vendor.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-protonvpn-nm-lib for openSUSE:Factory checked in at 2022-11-30 16:51:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-protonvpn-nm-lib (Old)
and /work/SRC/openSUSE:Factory/.python-protonvpn-nm-lib.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-protonvpn-nm-lib"
Wed Nov 30 16:51:44 2022 rev:6 rq:1039120 version:3.14.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-protonvpn-nm-lib/python-protonvpn-nm-lib.changes 2022-07-04 11:32:49.972019059 +0200
+++ /work/SRC/openSUSE:Factory/.python-protonvpn-nm-lib.new.1597/python-protonvpn-nm-lib.changes 2022-11-30 16:51:45.301380599 +0100
@@ -1,0 +2,8 @@
+Mon Nov 28 14:07:39 UTC 2022 - Alexandre Vicenzi <alexandre.vicenzi(a)suse.com>
+
+- Update to 3.14.0
+ * When vpn session is invalid and an api request is made, ensure that user is logged out
+ * Properly handle session refresh
+ * Display propper error message when unable to establish VPN tunnel
+
+-------------------------------------------------------------------
Old:
----
protonvpn-nm-lib-3.11.0.tar.gz
New:
----
protonvpn-nm-lib-3.14.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-protonvpn-nm-lib.spec ++++++
--- /var/tmp/diff_new_pack.MHIDcA/_old 2022-11-30 16:51:45.833383434 +0100
+++ /var/tmp/diff_new_pack.MHIDcA/_new 2022-11-30 16:51:45.841383477 +0100
@@ -21,7 +21,7 @@
# test suite requires network connection, you can test locally with `rpmbuild --with test`
%bcond_with test
Name: python-protonvpn-nm-lib
-Version: 3.11.0
+Version: 3.14.0
Release: 0
Summary: Proton VPN NetworkManager library
License: GPL-3.0-or-later
++++++ protonvpn-nm-lib-3.11.0.tar.gz -> protonvpn-nm-lib-3.14.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/.gitlab-ci.yml new/protonvpn-nm-lib-3.14.0/.gitlab-ci.yml
--- old/protonvpn-nm-lib-3.11.0/.gitlab-ci.yml 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/.gitlab-ci.yml 2022-10-20 17:13:58.000000000 +0200
@@ -70,18 +70,12 @@
extends: make-image-deb
script:
- make image-fed36 branch=$CI_COMMIT_REF_SLUG src=fedora36
-
-make-image-fed34:
- stage: image
- extends: make-image-deb
- script:
- - make image-fed34 branch=$CI_COMMIT_REF_SLUG src=fedora34
-
-make-image-fed35:
+
+make-image-fed37:
stage: image
extends: make-image-deb
script:
- - make image-fed35 branch=$CI_COMMIT_REF_SLUG src=fedora35
+ - make image-fed37 branch=$CI_COMMIT_REF_SLUG src=fedora37
######### CI Test Jobs ##########
test-deb:
@@ -105,18 +99,12 @@
needs:
- job: make-image-fed36
image: $CI_REGISTRY_IMAGE/fedora36:branch-$CI_COMMIT_REF_SLUG
-
-test-fed34:
- extends: test-deb
- needs:
- - job: make-image-fed34
- image: $CI_REGISTRY_IMAGE/fedora34:branch-$CI_COMMIT_REF_SLUG
-
-test-fed35:
+
+test-fed37:
extends: test-deb
needs:
- - job: make-image-fed35
- image: $CI_REGISTRY_IMAGE/fedora35:branch-$CI_COMMIT_REF_SLUG
+ - job: make-image-fed37
+ image: $CI_REGISTRY_IMAGE/fedora37:branch-$CI_COMMIT_REF_SLUG
## Jobs to publish commits + tags from master to github
@@ -125,8 +113,7 @@
needs:
- job: build-deb
- job: build-fed36
- - job: build-fed34
- - job: build-fed35
+ - job: build-fed37
when: manual
variables:
RELEASE_SYNC_PUBLIC_URL: git@github.com:ProtonVPN/protonvpn-nm-lib.git
@@ -139,8 +126,7 @@
needs:
- job: build-deb
- job: build-fed36
- - job: build-fed34
- - job: build-fed35
+ - job: build-fed37
when: manual
variables:
RELEASE_SYNC_PUBLIC_URL: git@github.com:ProtonVPN/protonvpn-nm-lib.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/Dockerfile.fed34 new/protonvpn-nm-lib-3.14.0/Dockerfile.fed34
--- old/protonvpn-nm-lib-3.11.0/Dockerfile.fed34 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/Dockerfile.fed34 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-FROM IMAGE_URL_FED34
-ARG git_repo
-ENV git_repo=${git_repo:-GIT_REPO}
-ARG git_branch
-ENV git_branch=${git_branch:-GIT_BRANCH}
-
-RUN dnf update -y
-
-#��Install a few useful packages
-
-RUN dnf install -y net-tools \
- gcc \
- sudo \
- git \
- rpm-build \
- rpm-devel \
- rpmlint \
- rpmdevtools \
- rpm-sign \
- python3 \
- python3-pip \
- NetworkManager \
- NetworkManager-openvpn \
- sudo \
- vim \
- nano \
- pkg-config \
- openvpn \
- openssl-devel \
- openssl-libs \
- dbus-x11 \
- gnome-keyring \
- libsecret \
- gtk3 \
- polkit
-
-RUN dnf install -y \
- python3-pyxdg \
- python3-dbus \
- python3-keyring \
- python3-distro \
- python3-gobject \
- python3-jinja2 \
- python3-systemd
-
-RUN dnf install -y \
- python3-pytest \
- python3-pytest-cov
-
-RUN dnf install -y \
- python3-requests \
- python3-pyOpenSSL \
- python3-bcrypt \
- python3-gnupg
-
-RUN python3 -m pip install --upgrade sentry-sdk==0.10.2
-
-RUN git clone --single-branch --branch $git_branch $git_repo
-RUN cd proton-python-client && pip3 install -e .
-RUN cd ..
-
-RUN useradd -ms /bin/bash user
-RUN usermod -a -G wheel user
-RUN echo '%wheel ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-COPY docker_entry_rpm.sh /usr/local/bin
-COPY . /home/user/protonvpn-nm-lib
-
-RUN chown -R user:user /home/user/protonvpn-nm-lib
-WORKDIR /home/user/protonvpn-nm-lib
-
-USER user
-
-ENTRYPOINT ["/usr/local/bin/docker_entry_rpm.sh"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/Dockerfile.fed35 new/protonvpn-nm-lib-3.14.0/Dockerfile.fed35
--- old/protonvpn-nm-lib-3.11.0/Dockerfile.fed35 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/Dockerfile.fed35 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-FROM IMAGE_URL_FED35
-ARG git_repo
-ENV git_repo=${git_repo:-GIT_REPO}
-ARG git_branch
-ENV git_branch=${git_branch:-GIT_BRANCH}
-
-RUN dnf update -y
-
-#��Install a few useful packages
-
-RUN dnf install -y net-tools \
- gcc \
- sudo \
- git \
- rpm-build \
- rpm-devel \
- rpmlint \
- rpmdevtools \
- rpm-sign \
- python3 \
- python3-pip \
- NetworkManager \
- NetworkManager-openvpn \
- sudo \
- vim \
- nano \
- pkg-config \
- openvpn \
- openssl-devel \
- openssl-libs \
- dbus-x11 \
- gnome-keyring \
- libsecret \
- gtk3 \
- polkit
-
-RUN dnf install -y \
- python3-pyxdg \
- python3-dbus \
- python3-keyring \
- python3-distro \
- python3-gobject \
- python3-jinja2 \
- python3-systemd
-
-RUN dnf install -y \
- python3-pytest \
- python3-pytest-cov
-
-RUN dnf install -y \
- python3-requests \
- python3-pyOpenSSL \
- python3-bcrypt \
- python3-gnupg
-
-RUN python3 -m pip install --upgrade sentry-sdk==0.10.2
-
-RUN git clone --single-branch --branch $git_branch $git_repo
-RUN cd proton-python-client && pip3 install -e .
-RUN cd ..
-
-RUN useradd -ms /bin/bash user
-RUN usermod -a -G wheel user
-RUN echo '%wheel ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-COPY docker_entry_rpm.sh /usr/local/bin
-COPY . /home/user/protonvpn-nm-lib
-
-RUN chown -R user:user /home/user/protonvpn-nm-lib
-WORKDIR /home/user/protonvpn-nm-lib
-
-USER user
-
-ENTRYPOINT ["/usr/local/bin/docker_entry_rpm.sh"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/Dockerfile.fed37 new/protonvpn-nm-lib-3.14.0/Dockerfile.fed37
--- old/protonvpn-nm-lib-3.11.0/Dockerfile.fed37 1970-01-01 01:00:00.000000000 +0100
+++ new/protonvpn-nm-lib-3.14.0/Dockerfile.fed37 2022-10-20 17:13:58.000000000 +0200
@@ -0,0 +1,74 @@
+FROM IMAGE_URL_FED37
+ARG git_repo
+ENV git_repo=${git_repo:-GIT_REPO}
+ARG git_branch
+ENV git_branch=${git_branch:-GIT_BRANCH}
+
+RUN dnf update -y
+
+#��Install a few useful packages
+
+RUN dnf install -y net-tools \
+ gcc \
+ sudo \
+ git \
+ rpm-build \
+ rpm-devel \
+ rpmlint \
+ rpmdevtools \
+ rpm-sign \
+ python3 \
+ python3-pip \
+ NetworkManager \
+ NetworkManager-openvpn \
+ sudo \
+ vim \
+ nano \
+ pkg-config \
+ openvpn \
+ openssl-devel \
+ openssl-libs \
+ dbus-x11 \
+ gnome-keyring \
+ libsecret \
+ gtk3 \
+ polkit
+
+RUN dnf install -y \
+ python3-pyxdg \
+ python3-dbus \
+ python3-keyring \
+ python3-distro \
+ python3-gobject \
+ python3-jinja2 \
+ python3-systemd
+
+RUN dnf install -y \
+ python3-pytest \
+ python3-pytest-cov
+
+RUN dnf install -y \
+ python3-requests \
+ python3-pyOpenSSL \
+ python3-bcrypt \
+ python3-gnupg
+
+RUN python3 -m pip install --upgrade sentry-sdk==0.10.2
+
+RUN git clone --single-branch --branch $git_branch $git_repo
+RUN cd proton-python-client && pip3 install -e .
+RUN cd ..
+
+RUN useradd -ms /bin/bash user
+RUN usermod -a -G wheel user
+RUN echo '%wheel ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+COPY docker_entry_rpm.sh /usr/local/bin
+COPY . /home/user/protonvpn-nm-lib
+
+RUN chown -R user:user /home/user/protonvpn-nm-lib
+WORKDIR /home/user/protonvpn-nm-lib
+
+USER user
+
+ENTRYPOINT ["/usr/local/bin/docker_entry_rpm.sh"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/Makefile new/protonvpn-nm-lib-3.14.0/Makefile
--- old/protonvpn-nm-lib-3.11.0/Makefile 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/Makefile 2022-10-20 17:13:58.000000000 +0200
@@ -14,12 +14,11 @@
IMAGE_URL_DEB = ubuntu:latest
IMAGE_URL_FED36 = fedora:36
-IMAGE_URL_FED34 = fedora:34
-IMAGE_URL_FED35 = fedora:35
+IMAGE_URL_FED37 = fedora:37
IMAGE_URL_ARCH = archlinux:latest
# Run make base to build both images based on ubuntu and fedora
-base: image-deb image-fed36 image-fed34 image-fed35 image-arch
+base: image-deb image-fed36 image-fed37 image-arch
# Create the image based on ubuntu
image-deb: image
@@ -32,25 +31,15 @@
image-arch: src = archlinux
-# Create the image based on fedora 31
-image-fed31: image
-image-fed31: DOCKER_FILE_SOURCE = Dockerfile.fed31
-image-fed31: src = fedora31
-
# Create the image based on fedora 36
image-fed36: image
image-fed36: DOCKER_FILE_SOURCE = Dockerfile.fed36
image-fed36: src = fedora36
-# Create the image based on fedora 34
-image-fed34: image
-image-fed34: DOCKER_FILE_SOURCE = Dockerfile.fed34
-image-fed34: src = fedora34
-
-# Create the image based on fedora 35
-image-fed35: image
-image-fed35: DOCKER_FILE_SOURCE = Dockerfile.fed35
-image-fed35: src = fedora35
+# Create the image based on fedora 37
+image-fed37: image
+image-fed37: DOCKER_FILE_SOURCE = Dockerfile.fed37
+image-fed37: src = fedora37
## Make remote image form a branch make image branch=<branchName> (master default)
@@ -61,7 +50,7 @@
## We host our own copy of the image ubuntu:latest
docker-source:
- sed "s|IMAGE_URL_FED36|$(IMAGE_URL_FED36)|; s|IMAGE_URL_FED34|$(IMAGE_URL_FED34)|; s|IMAGE_URL_FED35|$(IMAGE_URL_FED35)|; s|IMAGE_URL_DEB|$(IMAGE_URL_DEB)|; s|IMAGE_URL_ARCH|$(IMAGE_URL_ARCH)|" $(DOCKER_FILE_SOURCE) > /tmp/Dockerfile.image
+ sed "s|IMAGE_URL_FED36|$(IMAGE_URL_FED36)|; s|IMAGE_URL_FED37|$(IMAGE_URL_FED37)|; s|IMAGE_URL_DEB|$(IMAGE_URL_DEB)|; s|IMAGE_URL_ARCH|$(IMAGE_URL_ARCH)|" $(DOCKER_FILE_SOURCE) > /tmp/Dockerfile.image
requirements.txt:
@ touch requirements.txt
@@ -78,7 +67,7 @@
@ rm -rf __SOURCE_APP || true
local: NAME_IMAGE = protonvpn-nm-lib:latest
-local-base: local-deb local-fed36 local-fed34 local-fed35 local-arch
+local-base: local-deb local-fed36 local-fed37 local-arch
local-deb: local
local-deb: DOCKER_FILE_SOURCE = Dockerfile.deb
@@ -86,11 +75,8 @@
local-fed36: local
local-fed36: DOCKER_FILE_SOURCE = Dockerfile.fed36
-local-fed34: local
-local-fed34: DOCKER_FILE_SOURCE = Dockerfile.fed34
-
-local-fed35: local
-local-fed35: DOCKER_FILE_SOURCE = Dockerfile.fed35
+local-fed37: local
+local-fed37: DOCKER_FILE_SOURCE = Dockerfile.fed37
local-arch: local
local-arch: DOCKER_FILE_SOURCE = Dockerfile.arch
@@ -125,18 +111,8 @@
--volume $(PWD)/.env:/home/user/proton-python-client.env \
proton-python-client:latest \
python3 -m pytest
-
-test-fed34: local-fed34
- # Keep -it because with colors it's better
- @ docker run \
- --rm \
- -it \
- --privileged \
- --volume $(PWD)/.env:/home/user/proton-python-client.env \
- proton-python-client:latest \
- python3 -m pytest
-test-fed35: local-fed35
+test-fed37: local-fed37
# Keep -it because with colors it's better
@ docker run \
--rm \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/arch/PKGBUILD new/protonvpn-nm-lib-3.14.0/arch/PKGBUILD
--- old/protonvpn-nm-lib-3.11.0/arch/PKGBUILD 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/arch/PKGBUILD 2022-10-20 17:13:58.000000000 +0200
@@ -1,7 +1,7 @@
# Maintainer: Proton Technologies AG <opensource(a)proton.me>
pkgname=python-protonvpn-nm-lib
-pkgver=3.11.0
-pkgrel=2
+pkgver=3.12.0
+pkgrel=1
pkgdesc="Official Proton VPN NetworkManager library."
arch=("any")
url="https://github.com/ProtonVPN"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/debian/changelog new/protonvpn-nm-lib-3.14.0/debian/changelog
--- old/protonvpn-nm-lib-3.11.0/debian/changelog 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/debian/changelog 2022-10-20 17:13:58.000000000 +0200
@@ -1,3 +1,21 @@
+protonvpn-nm-lib (3.14.0-1) unstable; urgency=medium
+
+ * Fix: When vpn session is invalid and an api request is made, ensure that user is logged out
+
+ -- Proton Technologies AG <opensource(a)proton.me> Tue, 18 Oct 2022 16:00:00 +0000
+
+protonvpn-nm-lib (3.13.0-1) unstable; urgency=medium
+
+ * Fix: Properly handle session refresh
+
+ -- Proton Technologies AG <opensource(a)proton.me> Wed, 31 Aug 2022 16:00:00 +0000
+
+protonvpn-nm-lib (3.12.0-1) unstable; urgency=medium
+
+ * Fix: Display propper error message when unable to establish VPN tunnel
+
+ -- Proton Technologies AG <opensource(a)proton.me> Fri, 29 Jul 2022 16:00:00 +0000
+
protonvpn-nm-lib (3.11.0-2) unstable; urgency=medium
* Fix: When loading a session from keyring, update the app version and user agent with the current ones
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/protonvpn_nm_lib/constants.py new/protonvpn-nm-lib-3.14.0/protonvpn_nm_lib/constants.py
--- old/protonvpn-nm-lib-3.11.0/protonvpn_nm_lib/constants.py 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/protonvpn_nm_lib/constants.py 2022-10-20 17:13:58.000000000 +0200
@@ -13,7 +13,7 @@
SecureCoreStatusEnum, UserSettingConnectionEnum,
UserSettingStatusEnum)
-APP_VERSION = "3.11.0"
+APP_VERSION = "3.14.0"
API_URL = "https://api.protonvpn.ch"
IPv6_LEAK_PROTECTION_CONN_NAME = "pvpn-ipv6leak-protection"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/protonvpn_nm_lib/core/accounting/default_accounting.py new/protonvpn-nm-lib-3.14.0/protonvpn_nm_lib/core/accounting/default_accounting.py
--- old/protonvpn-nm-lib-3.11.0/protonvpn_nm_lib/core/accounting/default_accounting.py 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/protonvpn_nm_lib/core/accounting/default_accounting.py 2022-10-20 17:13:58.000000000 +0200
@@ -66,4 +66,4 @@
except: # noqa
current_sessions = self._env.api_session.max_connections
- return current_sessions >= self._env.api_session.max_connections
+ return current_sessions > self._env.api_session.max_connections
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/protonvpn_nm_lib/core/notification/notifications.py new/protonvpn-nm-lib-3.14.0/protonvpn_nm_lib/core/notification/notifications.py
--- old/protonvpn-nm-lib-3.11.0/protonvpn_nm_lib/core/notification/notifications.py 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/protonvpn_nm_lib/core/notification/notifications.py 2022-10-20 17:13:58.000000000 +0200
@@ -44,11 +44,12 @@
)
def get_all_notifications(self):
- try:
- _data = self.__data.get("Notifications", None)[0]
- except (IndexError, AttributeError) as e:
- logger.exception(e)
+ notifications = self.__data.get("Notifications", None)
+ if len(notifications) < 1:
+ logger.info("Nofitications are empty: {}".format(notifications))
_data = {}
+ else:
+ _data = notifications[0]
return BaseNotificationType.factory(_data)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/protonvpn_nm_lib/core/session/session.py new/protonvpn-nm-lib-3.14.0/protonvpn_nm_lib/core/session/session.py
--- old/protonvpn-nm-lib-3.11.0/protonvpn_nm_lib/core/session/session.py 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/protonvpn_nm_lib/core/session/session.py 2022-10-20 17:13:58.000000000 +0200
@@ -91,14 +91,13 @@
# Common handlers retries
def _handle_429(self, error, session, *args, **kwargs):
- logger.info("Catched 429 error, will retry")
+ logger.info("Catched 429 error, retrying new request if retry header present")
- hold_request_time = error.headers["Retry-After"]
+ hold_request_time = error.headers.get("Retry-After")
try:
hold_request_time = int(hold_request_time)
except ValueError:
- # Wait at least two seconds, and up to 20
- hold_request_time = 2 + random.random() * 18
+ raise UnreacheableAPIError(error)
logger.info("Retrying after {} seconds".format(hold_request_time))
time.sleep(hold_request_time)
@@ -106,12 +105,24 @@
# Retry
return self._call_original_function(session, *args, **kwargs)
+ def _handle_500(self, error, session, *args, **kwargs):
+ logger.info("Catched 500 error, raising exception")
+
+ raise UnreacheableAPIError(error)
+
def _handle_503(self, error, session, *args, **kwargs):
- logger.info("Catched 503 error, retrying new request")
+ logger.info("Catched 503 error, retrying new request if retry header present")
+
+ hold_request_time = error.headers.get("Retry-After")
+ try:
+ hold_request_time = int(hold_request_time)
+ except ValueError:
+ raise UnreacheableAPIError(error)
- # Wait between 2 and 10 seconds
- hold_request_time = 2 + random.random() * 8
+ logger.info("Retrying after {} seconds".format(hold_request_time))
time.sleep(hold_request_time)
+
+ # Retry
return self._call_original_function(session, *args, **kwargs)
def _handle_2011(self, error, session, *args, **kwargs):
@@ -145,17 +156,29 @@
return self._call_without_error_handling(session, *args, **kwargs)
def _handle_403(self, error, session, *args, **kwargs):
+ logger.info("Catched 403 error, missing scopes. Re-authentication needed.")
raise API403Error(error)
def _handle_5002(self, error, session, *args, **kwargs):
+ logger.info("Catched 5002 error, invalid version.")
raise API5002Error(error)
def _handle_5003(self, error, session, *args, **kwargs):
+ logger.info("Catched 5003 error, bad version.")
raise API5003Error(error)
def _handle_10013(self, error, session, *args, **kwargs):
+ logger.info("Catched 10013 error, session invalid.")
raise API10013Error(error)
+ def _handle_400(self, error, session, *args, **kwargs):
+ logger.info("Catched 400 error, session invalid.")
+ raise APISessionIsNotValidError(error)
+
+ def _handle_422(self, error, session, *args, **kwargs):
+ logger.info("Catched 422 error, session invalid.")
+ raise APISessionIsNotValidError(error)
+
class ErrorStrategyAuthenticate(ErrorStrategy):
def _handle_401(self, error, session, *args, **kwargs):
@@ -163,15 +186,33 @@
pass
def _handle_403(self, error, session, *args, **kwargs):
- logger.info("Ignored a 401 at authenticate")
+ logger.info("Ignored a 403 at authenticate")
pass
def _handle_8002(self, error, session, *args, **kwargs):
+ logger.info("Catched 8002, incorrect credentials.")
raise API8002Error(error)
class ErrorStrategyRefresh(ErrorStrategy):
- pass
+ def _handle_409(self, error, session, *args, **kwargs):
+ logger.info(
+ "Catched 409 error, possible race condition,"
+ "retry with error handling."
+ )
+ return self._call_without_error_handling(session, *args, **kwargs)
+
+ def _handle_10013(self, error, session, *args, **kwargs):
+ logger.info("Catched 10013 error, session invalid.")
+ raise APISessionIsNotValidError(error)
+
+ def _handle_400(self, error, session, *args, **kwargs):
+ logger.info("Catched 400 error, session invalid.")
+ raise APISessionIsNotValidError(error)
+
+ def _handle_422(self, error, session, *args, **kwargs):
+ logger.info("Catched 422 error, session invalid.")
+ raise APISessionIsNotValidError(error)
class APISession:
@@ -193,13 +234,12 @@
"""
- # Probably would be better to have that somewhere else
- FULL_CACHE_TIME_EXPIRE = 3 * (60 * 60) # 3h in seconds
- STREAMING_SERVICES_TIME_EXPIRE = FULL_CACHE_TIME_EXPIRE
- CLIENT_CONFIG_TIME_EXPIRE = FULL_CACHE_TIME_EXPIRE
- STREAMING_ICON_TIME_EXPIRE = 8 * (60 * 60) # 8h in seconds
- NOTIFICATIONS_TIME_EXPIRE = 12 * (60 * 60) # 12h in seconds
- LOADS_CACHE_TIME_EXPIRE = 15 * 60 # 15min in seconds
+ FULL_CACHE_TIME_EXPIRE = 10800 # 3h in seconds
+ STREAMING_SERVICES_TIME_EXPIRE = 10800
+ CLIENT_CONFIG_TIME_EXPIRE = 10800
+ STREAMING_ICON_TIME_EXPIRE = 28800 # 8h in seconds
+ NOTIFICATIONS_TIME_EXPIRE = 43200 # 12h in seconds
+ LOADS_CACHE_TIME_EXPIRE = 900 # 15min in seconds
RANDOM_FRACTION = 0.22 # Generate a value of the timeout, +/- up to 22%, at random
TIMEOUT = (3.05, 3.05)
@@ -633,6 +673,8 @@
try:
self.update_servers_if_needed()
+ except APISessionIsNotValidError:
+ raise
except: # noqa
pass
@@ -798,6 +840,8 @@
try:
self._update_notifications_if_needed()
+ except APISessionIsNotValidError:
+ raise
except: # noqa
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/protonvpn_nm_lib/exceptions.py new/protonvpn-nm-lib-3.14.0/protonvpn_nm_lib/exceptions.py
--- old/protonvpn-nm-lib-3.11.0/protonvpn_nm_lib/exceptions.py 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/protonvpn_nm_lib/exceptions.py 2022-10-20 17:13:58.000000000 +0200
@@ -110,6 +110,14 @@
"""Proton session wrapper error."""
+class API400Error(ProtonSessionWrapperError):
+ """Error 400.
+
+ Upon refreshing tokens, wwhen a request is badly formatted this exception
+ is raised. Usually requires a user to re-login.
+ """
+
+
class API401Error(ProtonSessionWrapperError):
"""Error 401.
@@ -124,6 +132,14 @@
"""
+class API422Error(ProtonSessionWrapperError):
+ """Error 422.
+
+ Upon refreshing tokens, this exception is raised
+ session has experied and re-login is required.
+ """
+
+
class API429Error(ProtonSessionWrapperError):
"""Error 429.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/rpmbuild/SPECS/python3-protonvpn-nm-lib.spec new/protonvpn-nm-lib-3.14.0/rpmbuild/SPECS/python3-protonvpn-nm-lib.spec
--- old/protonvpn-nm-lib-3.11.0/rpmbuild/SPECS/python3-protonvpn-nm-lib.spec 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/rpmbuild/SPECS/python3-protonvpn-nm-lib.spec 2022-10-20 17:13:58.000000000 +0200
@@ -1,6 +1,6 @@
%define unmangled_name protonvpn-nm-lib
-%define version 3.11.0
-%define release 2
+%define version 3.14.0
+%define release 1
Prefix: %{_prefix}
@@ -60,6 +60,18 @@
%defattr(-,root,root)
%changelog
+* Tue Oct 18 2022 Proton Technologies AG <opensource(a)proton.me> 3.14.0-1
+- Fix: When vpn session is invalid, ensure that user is logged out
+
+* Thu Sep 22 2022 Proton Technologies AG <opensource(a)proton.me> 3.13.0-2
+- Drop F34-35 and add F37
+
+* Fri Aug 31 2022 Proton Technologies AG <opensource(a)proton.me> 3.13.0-1
+- Fix: Properly handle session refresh
+
+* Fri Jul 29 2022 Proton Technologies AG <opensource(a)proton.me> 3.12.0-1
+- Fix: Display propper error message when unable to establish VPN tunnel
+
* Tue May 31 2022 Proton Technologies AG <opensource(a)proton.me> 3.11.0-2
- Fix: When loading a session from keyring, update the app version and user agent with the current ones
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protonvpn-nm-lib-3.11.0/tests/test_default_accounting.py new/protonvpn-nm-lib-3.14.0/tests/test_default_accounting.py
--- old/protonvpn-nm-lib-3.11.0/tests/test_default_accounting.py 2022-05-31 16:19:23.000000000 +0200
+++ new/protonvpn-nm-lib-3.14.0/tests/test_default_accounting.py 2022-10-20 17:13:58.000000000 +0200
@@ -92,7 +92,7 @@
super().__init__()
def get_sessions(self):
- return ["MockSession1", "MockSession2"]
+ return ["MockSession1", "MockSession2", "MockSession3"]
class TestDefaultAccounting:
1
0