From 51cfb78cadcc9b1f240c6800e931339e5e8badbc Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 17:47:41 +0000
Subject: [PATCH 08/14] gnu: aws-c-s3: Update to 0.1.26.

* gnu/packages/c.scm (aws-c-s3): Update to 0.1.26.
[arguments]: Fix CMAKE_PREFIX_PATH, disable network tests.
[source]: Remove patches.
* gnu/packages/patches/aws-c-s3-cmake-prefix.patch,
gnu/packages/patches/aws-c-s3-disable-networking-tests.patch:
Delete files.
* gnu/local.mk: Remove them.
---
 gnu/local.mk                                  |   2 -
 gnu/packages/c.scm                            |  14 +-
 .../patches/aws-c-s3-cmake-prefix.patch       |  13 --
 .../aws-c-s3-disable-networking-tests.patch   | 153 ------------------
 4 files changed, 7 insertions(+), 175 deletions(-)
 delete mode 100644 gnu/packages/patches/aws-c-s3-cmake-prefix.patch
 delete mode 100644 gnu/packages/patches/aws-c-s3-disable-networking-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index cdddaaf865..1666d8e05c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -873,8 +873,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/aws-c-auth-install-private-headers.patch	\
   %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch  \
   %D%/packages/patches/aws-c-mqtt-cmake-prefix.patch		\
-  %D%/packages/patches/aws-c-s3-cmake-prefix.patch		\
-  %D%/packages/patches/aws-c-s3-disable-networking-tests.patch	\
   %D%/packages/patches/aws-checksums-cmake-prefix.patch		\
   %D%/packages/patches/aws-crt-cpp-cmake-prefix.patch		\
   %D%/packages/patches/aws-crt-cpp-disable-networking-tests.patch	\
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index f87c51cefb..1c4d7a5bff 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -815,7 +815,8 @@ (define-public aws-c-auth
 (define-public aws-c-s3
   (package
     (name "aws-c-s3")
-    (version "0.1.19")
+    ; Update only when updating aws-crt-cpp.
+    (version "0.1.26")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -824,15 +825,14 @@ (define-public aws-c-s3
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1vkjd8dh99d8qsl7irnbkcdf9vjmcznx0jz186la0472z4h48wjj"))
-              (patches
-               (search-patches
-                "aws-c-s3-cmake-prefix.patch"
-                "aws-c-s3-disable-networking-tests.patch"))))
+                "0gaxnwwk0jbvkgjnxcgchq13xmn7jk5vjvjsps6b0vaz6bf12wv8"))))
     (build-system cmake-build-system)
     (arguments
      '(#:configure-flags
-       '("-DBUILD_SHARED_LIBS=ON")))
+       (list "-DBUILD_SHARED_LIBS=ON"
+             (string-append "-DCMAKE_PREFIX_PATH="
+                            (assoc-ref %build-inputs "aws-c-common"))
+             "-DENABLE_NET_TESTS=OFF")))
     (propagated-inputs
      `(("aws-c-auth" ,aws-c-auth)
        ("aws-c-http" ,aws-c-http)))
diff --git a/gnu/packages/patches/aws-c-s3-cmake-prefix.patch b/gnu/packages/patches/aws-c-s3-cmake-prefix.patch
deleted file mode 100644
index da3e4eb4a5..0000000000
--- a/gnu/packages/patches/aws-c-s3-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,10 @@ if (POLICY CMP0069)
-     cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
- endif()
- 
-+if (DEFINED ENV{CMAKE_PREFIX_PATH})
-+    set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
-+endif()
-+
- if (DEFINED CMAKE_PREFIX_PATH)
-     file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
- endif()
diff --git a/gnu/packages/patches/aws-c-s3-disable-networking-tests.patch b/gnu/packages/patches/aws-c-s3-disable-networking-tests.patch
deleted file mode 100644
index e8a3d8ed6a..0000000000
--- a/gnu/packages/patches/aws-c-s3-disable-networking-tests.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -23,8 +23,8 @@ add_test_case(test_s3_upload_part_message_new)
- add_test_case(test_s3_complete_multipart_message_new)
- add_test_case(test_s3_abort_multipart_upload_message_new)
- 
--add_net_test_case(test_s3_client_create_destroy)
--add_net_test_case(test_s3_client_max_active_connections_override)
-+#add_net_test_case(test_s3_client_create_destroy)
-+#add_net_test_case(test_s3_client_max_active_connections_override)
- add_test_case(test_s3_client_get_max_active_connections)
- add_test_case(test_s3_request_create_destroy)
- add_test_case(test_s3_client_queue_requests)
-@@ -37,75 +37,75 @@ add_test_case(test_s3_client_update_connections_too_many_conns)
- add_test_case(test_s3_client_update_connections_finish_result)
- add_test_case(test_s3_client_update_connections_clean_up)
- 
--add_net_test_case(test_s3_vip_create_destroy)
--add_net_test_case(test_s3_client_add_remove_vips)
--add_net_test_case(test_s3_client_resolve_vips)
-+#add_net_test_case(test_s3_vip_create_destroy)
-+#add_net_test_case(test_s3_client_add_remove_vips)
-+#add_net_test_case(test_s3_client_resolve_vips)
- add_test_case(test_s3_client_set_vip_connection_warm)
- add_test_case(test_s3_client_set_vip_connection_active)
- 
--add_net_test_case(test_s3_client_exceed_retries)
--add_net_test_case(test_s3_client_acquire_connection_fail)
--add_net_test_case(test_s3_meta_request_fail_prepare_request)
--add_net_test_case(test_s3_meta_request_sign_request_fail)
--add_net_test_case(test_s3_meta_request_send_request_finish_fail)
--add_net_test_case(test_s3_auto_range_put_missing_upload_id)
-+#add_net_test_case(test_s3_client_exceed_retries)
-+#add_net_test_case(test_s3_client_acquire_connection_fail)
-+#add_net_test_case(test_s3_meta_request_fail_prepare_request)
-+#add_net_test_case(test_s3_meta_request_sign_request_fail)
-+#add_net_test_case(test_s3_meta_request_send_request_finish_fail)
-+#add_net_test_case(test_s3_auto_range_put_missing_upload_id)
- 
--add_net_test_case(test_s3_cancel_mpu_create_not_sent)
--add_net_test_case(test_s3_cancel_mpu_create_completed)
--add_net_test_case(test_s3_cancel_mpu_one_part_completed)
--add_net_test_case(test_s3_cancel_mpu_all_parts_completed)
--add_net_test_case(test_s3_cancel_mpd_nothing_sent)
--add_net_test_case(test_s3_cancel_mpd_one_part_sent)
--add_net_test_case(test_s3_cancel_mpd_one_part_completed)
--add_net_test_case(test_s3_cancel_mpd_two_parts_completed)
--add_net_test_case(test_s3_cancel_mpd_head_object_sent)
--add_net_test_case(test_s3_cancel_mpd_head_object_completed)
--add_net_test_case(test_s3_cancel_mpd_get_without_range_sent)
--add_net_test_case(test_s3_cancel_mpd_get_without_range_completed)
-+#add_net_test_case(test_s3_cancel_mpu_create_not_sent)
-+#add_net_test_case(test_s3_cancel_mpu_create_completed)
-+#add_net_test_case(test_s3_cancel_mpu_one_part_completed)
-+#add_net_test_case(test_s3_cancel_mpu_all_parts_completed)
-+#add_net_test_case(test_s3_cancel_mpd_nothing_sent)
-+#add_net_test_case(test_s3_cancel_mpd_one_part_sent)
-+#add_net_test_case(test_s3_cancel_mpd_one_part_completed)
-+#add_net_test_case(test_s3_cancel_mpd_two_parts_completed)
-+#add_net_test_case(test_s3_cancel_mpd_head_object_sent)
-+#add_net_test_case(test_s3_cancel_mpd_head_object_completed)
-+#add_net_test_case(test_s3_cancel_mpd_get_without_range_sent)
-+#add_net_test_case(test_s3_cancel_mpd_get_without_range_completed)
- 
--add_net_test_case(test_s3_get_object_tls_disabled)
--add_net_test_case(test_s3_get_object_tls_enabled)
--add_net_test_case(test_s3_get_object_tls_default)
--add_net_test_case(test_s3_get_object_less_than_part_size)
--add_net_test_case(test_s3_get_object_empty_object)
--add_net_test_case(test_s3_get_object_multiple)
--add_net_test_case(test_s3_get_object_sse_kms)
--add_net_test_case(test_s3_get_object_sse_aes256)
--add_net_test_case(test_s3_no_signing)
--add_net_test_case(test_s3_signing_override)
--add_net_test_case(test_s3_put_object_tls_disabled)
--add_net_test_case(test_s3_put_object_tls_enabled)
--add_net_test_case(test_s3_put_object_tls_default)
--add_net_test_case(test_s3_multipart_put_object_with_acl)
--add_net_test_case(test_s3_put_object_multiple)
--add_net_test_case(test_s3_put_object_less_than_part_size)
--add_net_test_case(test_s3_put_object_empty_object)
--add_net_test_case(test_s3_put_object_with_part_remainder)
--add_net_test_case(test_s3_put_object_sse_kms)
--add_net_test_case(test_s3_put_object_sse_kms_multipart)
--add_net_test_case(test_s3_put_object_sse_aes256)
--add_net_test_case(test_s3_put_object_sse_aes256_multipart)
--add_net_test_case(test_s3_put_object_double_slashes)
--add_net_test_case(test_s3_meta_request_default)
--add_net_test_case(test_s3_put_object_fail_headers_callback)
--add_net_test_case(test_s3_put_object_fail_body_callback)
--add_net_test_case(test_s3_get_object_fail_headers_callback)
--add_net_test_case(test_s3_get_object_fail_body_callback)
--add_net_test_case(test_s3_default_fail_headers_callback)
--add_net_test_case(test_s3_default_fail_body_callback)
--add_net_test_case(test_s3_error_missing_file)
--add_net_test_case(test_s3_existing_host_entry)
--add_net_test_case(test_s3_put_fail_object_invalid_request)
--add_net_test_case(test_s3_put_fail_object_inputstream_fail_reading)
--add_net_test_case(test_s3_put_single_part_fail_object_inputstream_fail_reading)
--add_net_test_case(test_s3_bad_endpoint)
--add_net_test_case(test_s3_put_object_clamp_part_size)
--add_net_test_case(test_s3_different_endpoints)
--add_net_test_case(test_s3_auto_ranged_get_sending_user_agent)
--add_net_test_case(test_s3_auto_ranged_put_sending_user_agent)
--add_net_test_case(test_s3_default_sending_meta_request_user_agent)
--add_net_test_case(test_s3_range_requests)
--add_net_test_case(test_s3_not_satisfiable_range)
-+#add_net_test_case(test_s3_get_object_tls_disabled)
-+#add_net_test_case(test_s3_get_object_tls_enabled)
-+#add_net_test_case(test_s3_get_object_tls_default)
-+#add_net_test_case(test_s3_get_object_less_than_part_size)
-+#add_net_test_case(test_s3_get_object_empty_object)
-+#add_net_test_case(test_s3_get_object_multiple)
-+#add_net_test_case(test_s3_get_object_sse_kms)
-+#add_net_test_case(test_s3_get_object_sse_aes256)
-+#add_net_test_case(test_s3_no_signing)
-+#add_net_test_case(test_s3_signing_override)
-+#add_net_test_case(test_s3_put_object_tls_disabled)
-+#add_net_test_case(test_s3_put_object_tls_enabled)
-+#add_net_test_case(test_s3_put_object_tls_default)
-+#add_net_test_case(test_s3_multipart_put_object_with_acl)
-+#add_net_test_case(test_s3_put_object_multiple)
-+#add_net_test_case(test_s3_put_object_less_than_part_size)
-+#add_net_test_case(test_s3_put_object_empty_object)
-+#add_net_test_case(test_s3_put_object_with_part_remainder)
-+#add_net_test_case(test_s3_put_object_sse_kms)
-+#add_net_test_case(test_s3_put_object_sse_kms_multipart)
-+#add_net_test_case(test_s3_put_object_sse_aes256)
-+#add_net_test_case(test_s3_put_object_sse_aes256_multipart)
-+#add_net_test_case(test_s3_put_object_double_slashes)
-+#add_net_test_case(test_s3_meta_request_default)
-+#add_net_test_case(test_s3_put_object_fail_headers_callback)
-+#add_net_test_case(test_s3_put_object_fail_body_callback)
-+#add_net_test_case(test_s3_get_object_fail_headers_callback)
-+#add_net_test_case(test_s3_get_object_fail_body_callback)
-+#add_net_test_case(test_s3_default_fail_headers_callback)
-+#add_net_test_case(test_s3_default_fail_body_callback)
-+#add_net_test_case(test_s3_error_missing_file)
-+#add_net_test_case(test_s3_existing_host_entry)
-+#add_net_test_case(test_s3_put_fail_object_invalid_request)
-+#add_net_test_case(test_s3_put_fail_object_inputstream_fail_reading)
-+#add_net_test_case(test_s3_put_single_part_fail_object_inputstream_fail_reading)
-+#add_net_test_case(test_s3_bad_endpoint)
-+#add_net_test_case(test_s3_put_object_clamp_part_size)
-+#add_net_test_case(test_s3_different_endpoints)
-+#add_net_test_case(test_s3_auto_ranged_get_sending_user_agent)
-+#add_net_test_case(test_s3_auto_ranged_put_sending_user_agent)
-+#add_net_test_case(test_s3_default_sending_meta_request_user_agent)
-+#add_net_test_case(test_s3_range_requests)
-+#add_net_test_case(test_s3_not_satisfiable_range)
- 
- add_test_case(test_s3_replace_quote_entities)
- add_test_case(test_s3_parse_content_range_response_header)
-- 
2.33.1

