[2/3] python3-botocore: Update to 1.25.12

Message ID 20220519094027.200441-2-michael.tremer@ipfire.org
State Accepted
Commit 15194dcc3964265a2e64e9bea155989d96ddf326
Headers
Series [1/3] cloud: Execute user-data scripts at the end of initialization |

Commit Message

Michael Tremer May 19, 2022, 9:40 a.m. UTC
  Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/packages/python3-botocore | 21 +++++++++++++++------
 lfs/python3-botocore                       |  6 +++---
 2 files changed, 18 insertions(+), 9 deletions(-)
  

Comments

Jose A. Dias June 20, 2022, 3:03 p.m. UTC | #1
Hello *.

Some previous update broke aws-cli on my install. I did set this up and it
had worked. I was toying with the idea of adding to the ddns page to make
this more automatic but I wasn't ready yet.

This in turn broke my dehydrated cert update to aws' route53 service.

[root@harold .aws]# aws
Traceback (most recent call last):
  File "/usr/bin/aws", line 19, in <module>
    import awscli.clidriver
  File "/usr/lib/python3.10/site-packages/awscli/clidriver.py", line 17, in
<module>
    import botocore.session
  File "/usr/lib/python3.10/site-packages/botocore/session.py", line 26, in
<module>
    import botocore.client
  File "/usr/lib/python3.10/site-packages/botocore/client.py", line 16, in
<module>
    from botocore.args import ClientArgsCreator
  File "/usr/lib/python3.10/site-packages/botocore/args.py", line 27, in
<module>
    from botocore.config import Config
  File "/usr/lib/python3.10/site-packages/botocore/config.py", line 16, in
<module>
    from botocore.endpoint import DEFAULT_TIMEOUT, MAX_POOL_CONNECTIONS
  File "/usr/lib/python3.10/site-packages/botocore/endpoint.py", line 27, in
<module>
    from botocore.httpchecksum import handle_checksum_body
ModuleNotFoundError: No module named 'botocore.httpchecksum'

Suggestions? Or should I raise a bug? Or will this be fixed soon?

Thanks.
  
Peter Müller June 20, 2022, 9:42 p.m. UTC | #2
Hello Jose,

thanks for your e-mail.

Unfortunately, I have no experience with this add-ons. While I vaguely believe
the issue should be fixed in upcoming Core Update 169, it definitely should go
into a bug report so it cannot fall through the cracks.

Please refer to https://wiki.ipfire.org/devel/bugzilla for further information
on how to report bugs. As a general rule of thumb, anything support-related should
go to the forum/community (https://community.ipfire.org/), any confirmed bug in
the bugtracker, and anything development-related to this mailing list.

Hope not to have stirred up too much confusion. :-)

Thanks, and best regards,
Peter Müller


> Hello *.
> 
> Some previous update broke aws-cli on my install. I did set this up and it
> had worked. I was toying with the idea of adding to the ddns page to make
> this more automatic but I wasn't ready yet.
> 
> This in turn broke my dehydrated cert update to aws' route53 service.
> 
> [root@harold .aws]# aws
> Traceback (most recent call last):
>   File "/usr/bin/aws", line 19, in <module>
>     import awscli.clidriver
>   File "/usr/lib/python3.10/site-packages/awscli/clidriver.py", line 17, in
> <module>
>     import botocore.session
>   File "/usr/lib/python3.10/site-packages/botocore/session.py", line 26, in
> <module>
>     import botocore.client
>   File "/usr/lib/python3.10/site-packages/botocore/client.py", line 16, in
> <module>
>     from botocore.args import ClientArgsCreator
>   File "/usr/lib/python3.10/site-packages/botocore/args.py", line 27, in
> <module>
>     from botocore.config import Config
>   File "/usr/lib/python3.10/site-packages/botocore/config.py", line 16, in
> <module>
>     from botocore.endpoint import DEFAULT_TIMEOUT, MAX_POOL_CONNECTIONS
>   File "/usr/lib/python3.10/site-packages/botocore/endpoint.py", line 27, in
> <module>
>     from botocore.httpchecksum import handle_checksum_body
> ModuleNotFoundError: No module named 'botocore.httpchecksum'
> 
> Suggestions? Or should I raise a bug? Or will this be fixed soon?
> 
> Thanks.
  
Michael Tremer June 23, 2022, 12:32 p.m. UTC | #3
Hello Jose,

Yes, indeed the version of aws-cli in the stable tree is broken.

I just submitted two patches to the list that fix any problems. As soon as they have been merged into the tree and the build has run through, you can install the package from the “unstable” tree.

-Michael

> On 20 Jun 2022, at 16:03, jose.dias@diaslan.com wrote:
> 
> Hello *.
> 
> Some previous update broke aws-cli on my install. I did set this up and it
> had worked. I was toying with the idea of adding to the ddns page to make
> this more automatic but I wasn't ready yet.
> 
> This in turn broke my dehydrated cert update to aws' route53 service.
> 
> [root@harold .aws]# aws
> Traceback (most recent call last):
>  File "/usr/bin/aws", line 19, in <module>
>    import awscli.clidriver
>  File "/usr/lib/python3.10/site-packages/awscli/clidriver.py", line 17, in
> <module>
>    import botocore.session
>  File "/usr/lib/python3.10/site-packages/botocore/session.py", line 26, in
> <module>
>    import botocore.client
>  File "/usr/lib/python3.10/site-packages/botocore/client.py", line 16, in
> <module>
>    from botocore.args import ClientArgsCreator
>  File "/usr/lib/python3.10/site-packages/botocore/args.py", line 27, in
> <module>
>    from botocore.config import Config
>  File "/usr/lib/python3.10/site-packages/botocore/config.py", line 16, in
> <module>
>    from botocore.endpoint import DEFAULT_TIMEOUT, MAX_POOL_CONNECTIONS
>  File "/usr/lib/python3.10/site-packages/botocore/endpoint.py", line 27, in
> <module>
>    from botocore.httpchecksum import handle_checksum_body
> ModuleNotFoundError: No module named 'botocore.httpchecksum'
> 
> Suggestions? Or should I raise a bug? Or will this be fixed soon?
> 
> Thanks.
> -- 
> Jose Dias
> jose "dot" dias "at" DiasLan "dot" com
> 
> -----Original Message-----
> From: Development <development-bounces@lists.ipfire.org> On Behalf Of
> Michael Tremer
> Sent: May 19, 2022 5:40 AM
> To: development@lists.ipfire.org
> Cc: Michael Tremer <michael.tremer@ipfire.org>
> Subject: [PATCH 2/3] python3-botocore: Update to 1.25.12
> 
> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
> ---
> config/rootfiles/packages/python3-botocore | 21 +++++++++++++++------
> lfs/python3-botocore                       |  6 +++---
> 2 files changed, 18 insertions(+), 9 deletions(-)
> 
> diff --git a/config/rootfiles/packages/python3-botocore
> b/config/rootfiles/packages/python3-botocore
> index 638dff0eb..3696fe528 100644
> --- a/config/rootfiles/packages/python3-botocore
> +++ b/config/rootfiles/packages/python3-botocore
> @@ -1,10 +1,10 @@
> #usr/lib/python3.10/site-packages/botocore
> -#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info
> -#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/PKG-INFO
> -#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/SOURCES.
> txt
> -#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/dependen
> cy_links.txt
> -#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/requires
> .txt
> -#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/top_leve
> l.txt
> +#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info
> +#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info/PKG-
> +INFO 
> +#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info/SOUR
> +CES.txt 
> +#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info/depe
> +ndency_links.txt 
> +#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info/requ
> +ires.txt 
> +#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info/top_
> +level.txt
> usr/lib/python3.10/site-packages/botocore/__init__.py
> usr/lib/python3.10/site-packages/botocore/args.py
> usr/lib/python3.10/site-packages/botocore/auth.py
> @@ -183,6 +183,10 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
> 
> #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-identity/2021-04-2
> 0
> 
> #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-identity/2021-04-2
> 0/paginators-1.json
> 
> #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-identity/2021-04-2
> 0/service-2.json
> +#usr/lib/python3.10/site-packages/botocore/data/chime-sdk-media-pipelin
> +es
> +#usr/lib/python3.10/site-packages/botocore/data/chime-sdk-media-pipelin
> +es/2021-07-15 
> +#usr/lib/python3.10/site-packages/botocore/data/chime-sdk-media-pipelin
> +es/2021-07-15/paginators-1.json 
> +#usr/lib/python3.10/site-packages/botocore/data/chime-sdk-media-pipelin
> +es/2021-07-15/service-2.json
> #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-meetings
> 
> #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-meetings/2021-07-1
> 5
> 
> #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-meetings/2021-07-1
> 5/paginators-1.json
> @@ -202,6 +206,7 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
> #usr/lib/python3.10/site-packages/botocore/data/cloudcontrol
> #usr/lib/python3.10/site-packages/botocore/data/cloudcontrol/2021-09-30
> 
> #usr/lib/python3.10/site-packages/botocore/data/cloudcontrol/2021-09-30/pagi
> nators-1.json
> +#usr/lib/python3.10/site-packages/botocore/data/cloudcontrol/2021-09-30
> +/paginators-1.sdk-extras.json
> 
> #usr/lib/python3.10/site-packages/botocore/data/cloudcontrol/2021-09-30/serv
> ice-2.json
> 
> #usr/lib/python3.10/site-packages/botocore/data/cloudcontrol/2021-09-30/wait
> ers-2.json
> #usr/lib/python3.10/site-packages/botocore/data/clouddirectory
> @@ -848,6 +853,10 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
> #usr/lib/python3.10/site-packages/botocore/data/ivs/2020-07-14
> 
> #usr/lib/python3.10/site-packages/botocore/data/ivs/2020-07-14/paginators-1.
> json
> 
> #usr/lib/python3.10/site-packages/botocore/data/ivs/2020-07-14/service-2.jso
> n
> +#usr/lib/python3.10/site-packages/botocore/data/ivschat
> +#usr/lib/python3.10/site-packages/botocore/data/ivschat/2020-07-14
> +#usr/lib/python3.10/site-packages/botocore/data/ivschat/2020-07-14/pagi
> +nators-1.json 
> +#usr/lib/python3.10/site-packages/botocore/data/ivschat/2020-07-14/serv
> +ice-2.json
> #usr/lib/python3.10/site-packages/botocore/data/kafka
> #usr/lib/python3.10/site-packages/botocore/data/kafka/2018-11-14
> 
> #usr/lib/python3.10/site-packages/botocore/data/kafka/2018-11-14/paginators-
> 1.json
> diff --git a/lfs/python3-botocore b/lfs/python3-botocore index
> cbda1ca52..b5776f7c1 100644
> --- a/lfs/python3-botocore
> +++ b/lfs/python3-botocore
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 1.24.37
> +VER        = 1.25.12
> SUMMARY    = Python interface for AWS
> 
> THISAPP    = botocore-$(VER)
> @@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
> DIR_APP    = $(DIR_SRC)/$(THISAPP)
> TARGET     = $(DIR_INFO)/$(THISAPP)
> PROG       = python3-botocore
> -PAK_VER    = 5
> +PAK_VER    = 6
> 
> DEPS       = python3-dateutil python3-jmespath python3-urllib3
> 
> @@ -47,7 +47,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_BLAKE2 =
> 5e5495ba399e910479c0172eb4c572a5c0371db720906586c88dc59d8bfc58a50699b05125e1
> e554a8571b64654604447be1e1a4bfdc2b992272101060638908
> +$(DL_FILE)_BLAKE2 = 
> +6a15053917c9aac6e61490accbb3eddb5e243dfd900c5585dc527e2c7adb96e3d2094d5
> +a0b67e7e59de48dc622591fe287dd23aff1c7b912311b31c582748d35
> 
> install : $(TARGET)
> 
> --
> 2.30.2
> 
> 
>
  

Patch

diff --git a/config/rootfiles/packages/python3-botocore b/config/rootfiles/packages/python3-botocore
index 638dff0eb..3696fe528 100644
--- a/config/rootfiles/packages/python3-botocore
+++ b/config/rootfiles/packages/python3-botocore
@@ -1,10 +1,10 @@ 
 #usr/lib/python3.10/site-packages/botocore
-#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info
-#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info
+#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/botocore-1.25.12-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/botocore/__init__.py
 usr/lib/python3.10/site-packages/botocore/args.py
 usr/lib/python3.10/site-packages/botocore/auth.py
@@ -183,6 +183,10 @@  usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-identity/2021-04-20
 #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-identity/2021-04-20/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-identity/2021-04-20/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/chime-sdk-media-pipelines
+#usr/lib/python3.10/site-packages/botocore/data/chime-sdk-media-pipelines/2021-07-15
+#usr/lib/python3.10/site-packages/botocore/data/chime-sdk-media-pipelines/2021-07-15/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/chime-sdk-media-pipelines/2021-07-15/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-meetings
 #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-meetings/2021-07-15
 #usr/lib/python3.10/site-packages/botocore/data/chime-sdk-meetings/2021-07-15/paginators-1.json
@@ -202,6 +206,7 @@  usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/cloudcontrol
 #usr/lib/python3.10/site-packages/botocore/data/cloudcontrol/2021-09-30
 #usr/lib/python3.10/site-packages/botocore/data/cloudcontrol/2021-09-30/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/cloudcontrol/2021-09-30/paginators-1.sdk-extras.json
 #usr/lib/python3.10/site-packages/botocore/data/cloudcontrol/2021-09-30/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/cloudcontrol/2021-09-30/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/clouddirectory
@@ -848,6 +853,10 @@  usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/ivs/2020-07-14
 #usr/lib/python3.10/site-packages/botocore/data/ivs/2020-07-14/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/ivs/2020-07-14/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/ivschat
+#usr/lib/python3.10/site-packages/botocore/data/ivschat/2020-07-14
+#usr/lib/python3.10/site-packages/botocore/data/ivschat/2020-07-14/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/ivschat/2020-07-14/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/kafka
 #usr/lib/python3.10/site-packages/botocore/data/kafka/2018-11-14
 #usr/lib/python3.10/site-packages/botocore/data/kafka/2018-11-14/paginators-1.json
diff --git a/lfs/python3-botocore b/lfs/python3-botocore
index cbda1ca52..b5776f7c1 100644
--- a/lfs/python3-botocore
+++ b/lfs/python3-botocore
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 1.24.37
+VER        = 1.25.12
 SUMMARY    = Python interface for AWS
 
 THISAPP    = botocore-$(VER)
@@ -33,7 +33,7 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-botocore
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = python3-dateutil python3-jmespath python3-urllib3
 
@@ -47,7 +47,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 5e5495ba399e910479c0172eb4c572a5c0371db720906586c88dc59d8bfc58a50699b05125e1e554a8571b64654604447be1e1a4bfdc2b992272101060638908
+$(DL_FILE)_BLAKE2 = 6a15053917c9aac6e61490accbb3eddb5e243dfd900c5585dc527e2c7adb96e3d2094d5a0b67e7e59de48dc622591fe287dd23aff1c7b912311b31c582748d35
 
 install : $(TARGET)