From afa6d2a4a244c115fc54ccde8942798ac98318f0 Mon Sep 17 00:00:00 2001
From: Stephane Carrez <Stephane.Carrez@gmail.com>
Date: Mon, 26 Aug 2024 14:05:01 +0200
Subject: [PATCH] utilada 2.7.0 (#1183)

* Add Ada Utility Library 2.7.0 crate

* Update utilada_aws crate to disable Windows because AWS is broken on that host

* Submit update Ada Utility Crate 2.7.0 with Windows re-enabled for AWS

* Try to use AWS 23.0 on Windows since AWS 24.0 is broken
---
 index/ut/utilada/utilada-2.7.0.toml           |  2 +-
 index/ut/utilada_aws/utilada_aws-2.7.0.toml   | 25 +++++++++++--------
 index/ut/utilada_curl/utilada_curl-2.7.0.toml |  2 +-
 index/ut/utilada_lzma/utilada_lzma-2.7.0.toml |  2 +-
 index/ut/utilada_unit/utilada_unit-2.7.0.toml |  2 +-
 index/ut/utilada_xml/utilada_xml-2.7.0.toml   |  2 +-
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/index/ut/utilada/utilada-2.7.0.toml b/index/ut/utilada/utilada-2.7.0.toml
index ca26c25e..9a08e143 100644
--- a/index/ut/utilada/utilada-2.7.0.toml
+++ b/index/ut/utilada/utilada-2.7.0.toml
@@ -67,6 +67,6 @@ UTIL_OS = "win64"
 disabled = true
 
 [origin]
-commit = "716869dbd336387d5d80db3e7565586d34fc5d76"
+commit = "f98f7d02798d00e10660ec49d46e175f8748be56"
 url = "git+https://gitlab.com/stcarrez/ada-util.git"
 
diff --git a/index/ut/utilada_aws/utilada_aws-2.7.0.toml b/index/ut/utilada_aws/utilada_aws-2.7.0.toml
index 88ef29da..eda34916 100644
--- a/index/ut/utilada_aws/utilada_aws-2.7.0.toml
+++ b/index/ut/utilada_aws/utilada_aws-2.7.0.toml
@@ -28,7 +28,19 @@ An alternate HTTP backend is provided by CURL with `utilada_curl`.
 
 [[depends-on]]
 utilada = "^2.7.0"
-aws = "^24.0"
+
+[[depends-on]]
+# See https://github.com/AdaCore/aws/issues/380
+# and https://github.com/alire-project/alire/issues/1710
+[depends-on.'case(os)'.windows]
+aws = "^23.0.0"
+xmlada = "^23.0.0"
+gnatcoll = "^23.0.0"
+
+[depends-on.'case(os)'.'...']
+aws = "^24.0.0"
+xmlada = "^24.0.0"
+gnatcoll = "^24.0.0"
 
 [gpr-externals]
 UTIL_BUILD = ["distrib", "debug", "optimize", "profile", "coverage"]
@@ -38,20 +50,11 @@ UTIL_AWS_IMPL = ["1", "2", "3"]
 [gpr-set-externals]
 UTIL_AWS_IMPL = "3"
 
-# AWS is broken on Windows
-[available.'case(os)']
-linux = true
-freebsd = true
-macos = true
-windows = false
-'...' = false
-
-
 [configuration]
 disabled = true
 
 [origin]
-commit = "716869dbd336387d5d80db3e7565586d34fc5d76"
+commit = "f98f7d02798d00e10660ec49d46e175f8748be56"
 subdir = "./.alire/aws/"
 url = "git+https://gitlab.com/stcarrez/ada-util.git"
 
diff --git a/index/ut/utilada_curl/utilada_curl-2.7.0.toml b/index/ut/utilada_curl/utilada_curl-2.7.0.toml
index 08a2bdf6..2f56f8cf 100644
--- a/index/ut/utilada_curl/utilada_curl-2.7.0.toml
+++ b/index/ut/utilada_curl/utilada_curl-2.7.0.toml
@@ -38,7 +38,7 @@ UTIL_LIBRARY_TYPE = ["relocatable", "static", "static-pic"]
 disabled = true
 
 [origin]
-commit = "716869dbd336387d5d80db3e7565586d34fc5d76"
+commit = "f98f7d02798d00e10660ec49d46e175f8748be56"
 subdir = "./.alire/curl/"
 url = "git+https://gitlab.com/stcarrez/ada-util.git"
 
diff --git a/index/ut/utilada_lzma/utilada_lzma-2.7.0.toml b/index/ut/utilada_lzma/utilada_lzma-2.7.0.toml
index 7af489a4..e3eabeb8 100644
--- a/index/ut/utilada_lzma/utilada_lzma-2.7.0.toml
+++ b/index/ut/utilada_lzma/utilada_lzma-2.7.0.toml
@@ -35,7 +35,7 @@ UTIL_LIBRARY_TYPE = ["relocatable", "static", "static-pic"]
 disabled = true
 
 [origin]
-commit = "716869dbd336387d5d80db3e7565586d34fc5d76"
+commit = "f98f7d02798d00e10660ec49d46e175f8748be56"
 subdir = "./.alire/lzma/"
 url = "git+https://gitlab.com/stcarrez/ada-util.git"
 
diff --git a/index/ut/utilada_unit/utilada_unit-2.7.0.toml b/index/ut/utilada_unit/utilada_unit-2.7.0.toml
index 7845274e..b76e69c4 100644
--- a/index/ut/utilada_unit/utilada_unit-2.7.0.toml
+++ b/index/ut/utilada_unit/utilada_unit-2.7.0.toml
@@ -21,7 +21,7 @@ UTIL_LIBRARY_TYPE = ["relocatable", "static", "static-pic"]
 disabled = true
 
 [origin]
-commit = "716869dbd336387d5d80db3e7565586d34fc5d76"
+commit = "f98f7d02798d00e10660ec49d46e175f8748be56"
 subdir = "./.alire/unit/"
 url = "git+https://gitlab.com/stcarrez/ada-util.git"
 
diff --git a/index/ut/utilada_xml/utilada_xml-2.7.0.toml b/index/ut/utilada_xml/utilada_xml-2.7.0.toml
index a9a50555..79a2e5f6 100644
--- a/index/ut/utilada_xml/utilada_xml-2.7.0.toml
+++ b/index/ut/utilada_xml/utilada_xml-2.7.0.toml
@@ -35,7 +35,7 @@ UTIL_LIBRARY_TYPE = ["relocatable", "static", "static-pic"]
 disabled = true
 
 [origin]
-commit = "716869dbd336387d5d80db3e7565586d34fc5d76"
+commit = "f98f7d02798d00e10660ec49d46e175f8748be56"
 subdir = "./.alire/xml/"
 url = "git+https://gitlab.com/stcarrez/ada-util.git"