From 39754503e83f5f50ee25a2bcbac41d5bc436f7aa Mon Sep 17 00:00:00 2001
From: Ryan Sundberg <ryan@arctype.co>
Date: Thu, 4 Nov 2021 01:35:10 -0700
Subject: gnu: genimage: Update to 14.

Update genimage from version 11 to 14. A patch is required for the
tests due to differences in ext tooling.

* gnu/local.mk (dist_patch_DATA): Replace patch reference.
* gnu/packages/genimage.scm: Update package source.
* gnu/packages/patches/genimage-mke2fs-test.patch: New patch file.
* gnu/packages/patches/genimage-signedness.patch: Delete obsolete patch.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 gnu/local.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index 05258ac054..208875754b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1128,7 +1128,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gdk-pixbuf-CVE-2020-29385.patch		\
   %D%/packages/patches/gdm-default-session.patch		\
   %D%/packages/patches/geary-CVE-2020-24661.patch		\
-  %D%/packages/patches/genimage-signedness.patch		\
+  %D%/packages/patches/genimage-mke2fs-test.patch		\
   %D%/packages/patches/geoclue-config.patch			\
   %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch	\
   %D%/packages/patches/ghc-testsuite-dlopen-pie.patch		\
-- 
cgit v1.2.3


From ce9b9e7cba87f648dff911d5c055e2a833c25c43 Mon Sep 17 00:00:00 2001
From: phodina <phodina@protonmail.com>
Date: Tue, 9 Nov 2021 17:04:49 +0000
Subject: gnu: Add rust-adblock-0.4.

* gnu/packages/crates-io.scm (rust-adblock-0.4): New variable.
* gnu/packages/patches/rust-adblock-ignore-live-tests.patch: New file.
* gnu/local.mk: Add patch.

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
---
 gnu/local.mk                                       |  1 +
 gnu/packages/crates-io.scm                         | 54 +++++++++++++++++
 .../patches/rust-adblock-ignore-live-tests.patch   | 69 ++++++++++++++++++++++
 3 files changed, 124 insertions(+)
 create mode 100644 gnu/packages/patches/rust-adblock-ignore-live-tests.patch

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index 208875754b..5b21a6ee1b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1752,6 +1752,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
   %D%/packages/patches/rust-1.45-linker-locale.patch		\
   %D%/packages/patches/rust-1.48-linker-locale.patch		\
+  %D%/packages/patches/rust-adblock-ignore-live-tests.patch		\
   %D%/packages/patches/rust-bootstrap-stage0-test.patch		\
   %D%/packages/patches/rust-coresimd-doctest.patch		\
   %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch	\
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 692cd2a28b..9327ed5e1c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -984,6 +984,60 @@ threads.  This makes it robust in face of panics (it won't make your program
 deadlock, like the standard Barrier).")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-adblock-0.4
+  (package
+    (name "rust-adblock")
+    (version "0.4.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/brave/adblock-rust")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (patches (search-patches "rust-adblock-ignore-live-tests.patch"))
+       (sha256
+        (base32
+         "0l2iacwkm66z6wc71wy62x2k5xllx94adrqncicxqsx203c3ljpl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-addr" ,rust-addr-0.14)
+        ("rust-base64" ,rust-base64-0.13)
+        ("rust-bitflags" ,rust-bitflags-1)
+        ("rust-cssparser" ,rust-cssparser-0.25)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-idna" ,rust-idna-0.2)
+        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-lifeguard" ,rust-lifeguard-0.6)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-percent-encoding"
+         ,rust-percent-encoding-2)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-rmp-serde" ,rust-rmp-serde-0.13)
+        ("rust-rmp-serde" ,rust-rmp-serde-0.15)
+        ("rust-seahash" ,rust-seahash-3)
+        ("rust-selectors" ,rust-selectors-0.21)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-twoway" ,rust-twoway-0.2)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-csv" ,rust-csv-1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-sha2" ,rust-sha2-0.9)
+        ("rust-tokio" ,rust-tokio-1.8))))
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("openssl" ,openssl)))
+    (home-page "https://github.com/brave/adblock-rust/")
+    (synopsis "Adblock Plus syntax filter parsing and matching")
+    (description "This package provides native Rust module for Adblock Plus
+syntax (e.g.  EasyList, EasyPrivacy) filter parsing and matching.")
+    (license license:mpl2.0)))
+
 (define-public rust-addr2line-0.14
   (package
     (name "rust-addr2line")
diff --git a/gnu/packages/patches/rust-adblock-ignore-live-tests.patch b/gnu/packages/patches/rust-adblock-ignore-live-tests.patch
new file mode 100644
index 0000000000..fc7f2858ff
--- /dev/null
+++ b/gnu/packages/patches/rust-adblock-ignore-live-tests.patch
@@ -0,0 +1,69 @@
+From b83b5b453d3f7883ef4c12f84a7045486957c709 Mon Sep 17 00:00:00 2001
+From: Petr Hodina <phodina@protonmail.com>
+Date: Tue, 9 Nov 2021 17:02:54 +0100
+Subject: [PATCH] Ignore live tests.
+
+
+diff --git a/tests/live.rs b/tests/live.rs
+index b1a19fc..6bd4685 100644
+--- a/tests/live.rs
++++ b/tests/live.rs
+@@ -140,6 +140,7 @@ fn get_blocker_engine_deserialized_ios() -> Engine {
+ }
+
+ #[test]
++#[ignore]
+ fn check_live_specific_urls() {
+     let mut engine = get_blocker_engine();
+     {
+@@ -176,6 +177,7 @@ fn check_live_specific_urls() {
+ }
+
+ #[test]
++#[ignore]
+ fn check_live_deserialized_specific_urls() {
+     let mut engine = get_blocker_engine_deserialized();
+     {
+@@ -201,6 +203,7 @@ fn check_live_deserialized_specific_urls() {
+ }
+
+ #[test]
++#[ignore]
+ fn check_live_from_filterlists() {
+     let engine = get_blocker_engine();
+     let requests = load_requests();
+@@ -214,6 +217,7 @@ fn check_live_from_filterlists() {
+ }
+
+ #[test]
++#[ignore]
+ fn check_live_deserialized_file() {
+     let engine = get_blocker_engine_deserialized();
+     let requests = load_requests();
+@@ -243,6 +247,7 @@ fn check_live_deserialized_ios() {
+
+ #[cfg(feature = "resource_assembler")]
+ #[test]
++#[ignore]
+ fn check_live_redirects() {
+     use adblock::resources::resource_assembler::assemble_web_accessible_resources;
+
+@@ -278,6 +283,7 @@ fn check_live_redirects() {
+ }
+
+ #[test]
++#[ignore]
+ /// Ensure that two different engines loaded from the same textual filter set serialize to
+ /// identical buffers.
+ fn stable_serialization() {
+@@ -291,6 +297,7 @@ fn stable_serialization() {
+ }
+
+ #[test]
++#[ignore]
+ /// Ensure that one engine's serialization result can be exactly reproduced by another engine after
+ /// deserializing from it.
+ fn stable_serialization_through_load() {
+--
+2.33.1
+
-- 
cgit v1.2.3


From 2a32dedfbfa262ad782421064e5be6f1403bcb9f Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 17:32:57 +0000
Subject: gnu: aws-c-io: Update to 0.10.9.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/c.scm (aws-c-io): Update to 0.10.9.
[arguments]: Fix CMAKE_PREFIX_PATH, disable network tests.
[source]: Remove patches.
* gnu/packages/patches/aws-c-io-cmake-prefix.patch,
gnu/packages/patches/aws-c-io-disable-networking-tests.patch:
Delete files.
* gnu/local.mk: Remove them.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                       |   2 -
 gnu/packages/c.scm                                 |  14 +--
 gnu/packages/patches/aws-c-io-cmake-prefix.patch   |  13 ---
 .../aws-c-io-disable-networking-tests.patch        | 103 ---------------------
 4 files changed, 7 insertions(+), 125 deletions(-)
 delete mode 100644 gnu/packages/patches/aws-c-io-cmake-prefix.patch
 delete mode 100644 gnu/packages/patches/aws-c-io-disable-networking-tests.patch

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index 5b21a6ee1b..9986b01537 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -878,8 +878,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/aws-c-http-cmake-prefix.patch		\
   %D%/packages/patches/aws-c-http-disable-networking-tests.patch\
   %D%/packages/patches/aws-c-mqtt-cmake-prefix.patch		\
-  %D%/packages/patches/aws-c-io-cmake-prefix.patch		\
-  %D%/packages/patches/aws-c-io-disable-networking-tests.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		\
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 0b9830a5f3..1479cf847d 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -638,7 +638,8 @@ communication.")
 (define-public aws-c-io
   (package
     (name "aws-c-io")
-    (version "0.10.5")
+    ; Update only when updating aws-crt-cpp.
+    (version "0.10.9")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -647,15 +648,14 @@ communication.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1jrnzs803jqprnvbw6rqr834qld5sd7flaqzgssp3099m189szpq"))
-              (patches
-               (search-patches
-                "aws-c-io-cmake-prefix.patch"
-                "aws-c-io-disable-networking-tests.patch"))))
+                "14rxa3k842fgk43702nz7z9y3clfhvax8j0k93i0c5vg14wj38yp"))))
     (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-cal" ,aws-c-cal)
        ("aws-c-common" ,aws-c-common)
diff --git a/gnu/packages/patches/aws-c-io-cmake-prefix.patch b/gnu/packages/patches/aws-c-io-cmake-prefix.patch
deleted file mode 100644
index da3e4eb4a5..0000000000
--- a/gnu/packages/patches/aws-c-io-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-io-disable-networking-tests.patch b/gnu/packages/patches/aws-c-io-disable-networking-tests.patch
deleted file mode 100644
index e2e3afea13..0000000000
--- a/gnu/packages/patches/aws-c-io-disable-networking-tests.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -52,8 +52,8 @@ add_test_case(local_socket_communication)
- add_net_test_case(tcp_socket_communication)
- add_net_test_case(udp_socket_communication)
- add_test_case(udp_bind_connect_communication)
--add_net_test_case(connect_timeout)
--add_net_test_case(connect_timeout_cancelation)
-+#add_net_test_case(connect_timeout)
-+#add_net_test_case(connect_timeout_cancelation)
- if (USE_VSOCK)
- 	add_test_case(vsock_loopback_socket_communication)
- endif ()
-@@ -64,7 +64,7 @@ add_test_case(incoming_tcp_sock_errors)
- add_test_case(incoming_duplicate_tcp_bind_errors)
- add_test_case(incoming_udp_sock_errors)
- add_test_case(wrong_thread_read_write_fails)
--add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode)
-+#add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode)
- add_test_case(cleanup_in_accept_doesnt_explode)
- add_test_case(cleanup_in_write_cb_doesnt_explode)
- add_test_case(sock_write_cb_is_async)
-@@ -81,21 +81,21 @@ add_test_case(channel_tasks_run)
- add_test_case(channel_rejects_post_shutdown_tasks)
- add_test_case(channel_cancels_pending_tasks)
- add_test_case(channel_duplicate_shutdown)
--add_net_test_case(channel_connect_some_hosts_timeout)
-+#add_net_test_case(channel_connect_some_hosts_timeout)
- 
--add_net_test_case(test_default_with_ipv6_lookup)
-+#add_net_test_case(test_default_with_ipv6_lookup)
- add_test_case(test_resolver_ipv6_address_lookup)
--add_net_test_case(test_default_with_multiple_lookups)
-+#add_net_test_case(test_default_with_multiple_lookups)
- add_test_case(test_resolver_ipv4_address_lookup)
--add_net_test_case(test_default_with_ipv4_only_lookup)
-+#add_net_test_case(test_default_with_ipv4_only_lookup)
- add_test_case(test_resolver_ttls)
- add_test_case(test_resolver_connect_failure_recording)
- add_test_case(test_resolver_ttl_refreshes_on_resolve)
- 
- add_net_test_case(test_resolver_listener_create_destroy)
--add_net_test_case(test_resolver_add_listener_before_host)
--add_net_test_case(test_resolver_add_listener_after_host)
--add_net_test_case(test_resolver_add_multiple_listeners_fn)
-+#add_net_test_case(test_resolver_add_listener_before_host)
-+#add_net_test_case(test_resolver_add_listener_after_host)
-+#add_net_test_case(test_resolver_add_multiple_listeners_fn)
- add_net_test_case(test_resolver_listener_host_re_add_fn)
- add_net_test_case(test_resolver_listener_multiple_results)
- add_net_test_case(test_resolver_listener_address_expired_fn)
-@@ -121,11 +121,11 @@ add_test_case(socket_handler_close)
- if (NOT BYO_CRYPTO)
-     add_net_test_case(test_concurrent_cert_import)
-     add_test_case(tls_channel_echo_and_backpressure_test)
--    add_net_test_case(tls_client_channel_negotiation_error_expired)
--    add_net_test_case(tls_client_channel_negotiation_error_wrong_host)
--    add_net_test_case(tls_client_channel_negotiation_error_wrong_host_with_ca_override)
--    add_net_test_case(tls_client_channel_negotiation_error_self_signed)
--    add_net_test_case(tls_client_channel_negotiation_error_untrusted_root)
-+    #add_net_test_case(tls_client_channel_negotiation_error_expired)
-+    #add_net_test_case(tls_client_channel_negotiation_error_wrong_host)
-+    #add_net_test_case(tls_client_channel_negotiation_error_wrong_host_with_ca_override)
-+    #add_net_test_case(tls_client_channel_negotiation_error_self_signed)
-+    #add_net_test_case(tls_client_channel_negotiation_error_untrusted_root)
-     #track these down in s2n and find out why that aren't failing.
-     #add_net_test_case(tls_client_channel_negotiation_error_revoked)
-     #add_net_test_case(tls_client_channel_negotiation_error_pinning)
-@@ -133,23 +133,23 @@ if (NOT BYO_CRYPTO)
-     # once done, add these tests as well
-     #add_net_test_case(tls_client_channel_negotiation_no_verify_revoked)
-     #add_net_test_case(tls_client_channel_negotiation_no_verify_pinning)
--    add_net_test_case(tls_client_channel_negotiation_no_verify_expired)
--    add_net_test_case(tls_client_channel_negotiation_no_verify_wrong_host)
--    add_net_test_case(tls_client_channel_negotiation_no_verify_self_signed)
--    add_net_test_case(tls_client_channel_negotiation_no_verify_untrusted_root)
--
--    add_net_test_case(tls_client_channel_negotiation_error_socket_closed)
--    add_net_test_case(tls_client_channel_negotiation_success)
--    add_net_test_case(tls_client_channel_negotiation_success_ecc256)
--    add_net_test_case(tls_client_channel_negotiation_success_ecc384)
-+    #add_net_test_case(tls_client_channel_negotiation_no_verify_expired)
-+    #add_net_test_case(tls_client_channel_negotiation_no_verify_wrong_host)
-+    #add_net_test_case(tls_client_channel_negotiation_no_verify_self_signed)
-+    #add_net_test_case(tls_client_channel_negotiation_no_verify_untrusted_root)
-+
-+    #add_net_test_case(tls_client_channel_negotiation_error_socket_closed)
-+    #add_net_test_case(tls_client_channel_negotiation_success)
-+    #add_net_test_case(tls_client_channel_negotiation_success_ecc256)
-+    #add_net_test_case(tls_client_channel_negotiation_success_ecc384)
-     add_net_test_case(tls_server_multiple_connections)
-     add_net_test_case(tls_server_hangup_during_negotiation)
--    add_net_test_case(tls_client_channel_no_verify)
-+    #add_net_test_case(tls_client_channel_no_verify)
-     add_net_test_case(test_tls_negotiation_timeout)
-     add_net_test_case(tls_double_channel)
-     add_net_test_case(alpn_successfully_negotiates)
-     add_net_test_case(alpn_no_protocol_message)
--    add_net_test_case(test_ecc_cert_import)
-+    #add_net_test_case(test_ecc_cert_import)
-     add_test_case(alpn_error_creating_handler)
-     add_test_case(tls_destroy_null_context)
-     add_test_case(tls_channel_statistics_test)
-- 
cgit v1.2.3


From 4ff5cd6b0645a06a6542834f6ff83d725ce61b5c Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 17:33:03 +0000
Subject: gnu: aws-c-cal: Update to 0.5.12.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/c.scm (aws-c-cal): Update to 0.5.12.
[arguments]: Fix CMAKE_PREFIX_PATH.
[source]: Remove patch.
* gnu/packages/patches/aws-c-cal-cmake-prefix.patch: Delete file.
* gnu/local.mk: Remove it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                      |  1 -
 gnu/packages/c.scm                                | 10 ++++++----
 gnu/packages/patches/aws-c-cal-cmake-prefix.patch | 13 -------------
 3 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 gnu/packages/patches/aws-c-cal-cmake-prefix.patch

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index 9986b01537..a1cc397f3b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -872,7 +872,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/awesome-reproducible-png.patch		\
   %D%/packages/patches/aws-c-auth-cmake-prefix.patch		\
   %D%/packages/patches/aws-c-auth-disable-networking-tests.patch\
-  %D%/packages/patches/aws-c-cal-cmake-prefix.patch		\
   %D%/packages/patches/aws-c-compression-cmake-prefix.patch	\
   %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch  \
   %D%/packages/patches/aws-c-http-cmake-prefix.patch		\
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 1479cf847d..a537988abe 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -669,7 +669,8 @@ event-driven, asynchronous network application protocols.")
 (define-public aws-c-cal
   (package
     (name "aws-c-cal")
-    (version "0.5.11")
+    ; Update only when updating aws-crt-cpp.
+    (version "0.5.12")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -678,12 +679,13 @@ event-driven, asynchronous network application protocols.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0rqqk4n56h8sf4q070rhgjwas04j8h0vq4wl1alq5l1rqq72qqdf"))
-              (patches (search-patches "aws-c-cal-cmake-prefix.patch"))))
+                "09zqf610x4g2mcjcaf9nh88k6dkw14pi721yr8hxb5rmsx7rlfrb"))))
     (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")))))
     (propagated-inputs
      `(("aws-c-common" ,aws-c-common)))
     (inputs
diff --git a/gnu/packages/patches/aws-c-cal-cmake-prefix.patch b/gnu/packages/patches/aws-c-cal-cmake-prefix.patch
deleted file mode 100644
index 1ee7aa851d..0000000000
--- a/gnu/packages/patches/aws-c-cal-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,6 +10,10 @@ endif()
- 
- option(BYO_CRYPTO "Set this if you want to provide your own cryptography implementation. This will cause the defaults to not be compiled." OFF)
- 
-+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()
-- 
cgit v1.2.3


From 1a0ed46097dfc41e74354c44bd410a97e41df785 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 17:33:07 +0000
Subject: gnu: aws-c-http: Update to 0.6.7.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/c.scm (aws-c-http): Update to 0.6.7.
[arguments]: Fix CMAKE_PREFIX_PATH, disable network tests.
[source]: Remove patches.
* gnu/packages/patches/aws-c-http-cmake-prefix.patch,
gnu/packages/patches/aws-c-http-disable-networking-tests.patch:
Delete files.
* gnu/local.mk: Remove them.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                       |  2 -
 gnu/packages/c.scm                                 | 14 +++----
 gnu/packages/patches/aws-c-http-cmake-prefix.patch | 13 ------
 .../aws-c-http-disable-networking-tests.patch      | 48 ----------------------
 4 files changed, 7 insertions(+), 70 deletions(-)
 delete mode 100644 gnu/packages/patches/aws-c-http-cmake-prefix.patch
 delete mode 100644 gnu/packages/patches/aws-c-http-disable-networking-tests.patch

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index a1cc397f3b..654d7d6c40 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -874,8 +874,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/aws-c-auth-disable-networking-tests.patch\
   %D%/packages/patches/aws-c-compression-cmake-prefix.patch	\
   %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch  \
-  %D%/packages/patches/aws-c-http-cmake-prefix.patch		\
-  %D%/packages/patches/aws-c-http-disable-networking-tests.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	\
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index a537988abe..2b80303170 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -719,7 +719,8 @@ low level functionality for coroutines.")
 (define-public aws-c-http
   (package
     (name "aws-c-http")
-    (version "0.6.4")
+    ; Update only when updating aws-crt-cpp.
+    (version "0.6.7")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -728,15 +729,14 @@ low level functionality for coroutines.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "18xlgz68zizkcp784bs6hkyx0gvp0f1p076i46z653bcd3qa87b4"))
-              (patches
-               (search-patches
-                "aws-c-http-cmake-prefix.patch"
-                "aws-c-http-disable-networking-tests.patch"))))
+                "1s06bz6w7355ldyhwjidcpbff7591ch4lwwjcj47a6k2kczdmiz4"))))
     (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-compression" ,aws-c-compression)
        ("aws-c-io" ,aws-c-io)))
diff --git a/gnu/packages/patches/aws-c-http-cmake-prefix.patch b/gnu/packages/patches/aws-c-http-cmake-prefix.patch
deleted file mode 100644
index ec650a7e82..0000000000
--- a/gnu/packages/patches/aws-c-http-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,10 @@ endif()
- 
- option(ENABLE_PROXY_INTEGRATION_TESTS "Whether to run the proxy integration tests that rely on a proxy server installed and running locally" OFF)
- 
-+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-http-disable-networking-tests.patch b/gnu/packages/patches/aws-c-http-disable-networking-tests.patch
deleted file mode 100644
index 9bfd422341..0000000000
--- a/gnu/packages/patches/aws-c-http-disable-networking-tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -136,8 +136,8 @@ add_test_case(strutil_trim_http_whitespace)
- add_test_case(strutil_is_http_token)
- add_test_case(strutil_is_lowercase_http_token)
- 
--add_net_test_case(tls_download_medium_file_h1)
--add_net_test_case(tls_download_medium_file_h2)
-+#add_net_test_case(tls_download_medium_file_h1)
-+#add_net_test_case(tls_download_medium_file_h2)
- 
- add_test_case(websocket_decoder_sanity_check)
- add_test_case(websocket_decoder_simplest_frame)
-@@ -438,21 +438,21 @@ add_test_case(connection_setup_shutdown)
- 
- # connection manager tests
- # unit tests where connections are mocked
--add_net_test_case(test_connection_manager_setup_shutdown)
--add_net_test_case(test_connection_manager_acquire_release_mix_synchronous)
--add_net_test_case(test_connection_manager_connect_callback_failure)
--add_net_test_case(test_connection_manager_connect_immediate_failure)
--add_net_test_case(test_connection_manager_proxy_setup_shutdown)
--add_net_test_case(test_connection_manager_idle_culling_single)
--add_net_test_case(test_connection_manager_idle_culling_many)
--add_net_test_case(test_connection_manager_idle_culling_mixture)
-+#add_net_test_case(test_connection_manager_setup_shutdown)
-+#add_net_test_case(test_connection_manager_acquire_release_mix_synchronous)
-+#add_net_test_case(test_connection_manager_connect_callback_failure)
-+#add_net_test_case(test_connection_manager_connect_immediate_failure)
-+#add_net_test_case(test_connection_manager_proxy_setup_shutdown)
-+#add_net_test_case(test_connection_manager_idle_culling_single)
-+#add_net_test_case(test_connection_manager_idle_culling_many)
-+#add_net_test_case(test_connection_manager_idle_culling_mixture)
- 
- # tests where we establish real connections
--add_net_test_case(test_connection_manager_single_connection)
--add_net_test_case(test_connection_manager_many_connections)
--add_net_test_case(test_connection_manager_acquire_release)
--add_net_test_case(test_connection_manager_close_and_release)
--add_net_test_case(test_connection_manager_acquire_release_mix)
-+#add_net_test_case(test_connection_manager_single_connection)
-+#add_net_test_case(test_connection_manager_many_connections)
-+#add_net_test_case(test_connection_manager_acquire_release)
-+#add_net_test_case(test_connection_manager_close_and_release)
-+#add_net_test_case(test_connection_manager_acquire_release_mix)
- 
- 
- add_test_case(h1_server_sanity_check)
-- 
cgit v1.2.3


From cff8a12a0a23f09fe1bc0d55f8d7e35ca6054ba0 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 17:36:24 +0000
Subject: gnu: aws-c-compression: Update to 0.2.14.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/c.scm (aws-c-compression): Update to 0.2.14.
[arguments]: Fix CMAKE_PREFIX_PATH.
[source]: Remove patch.
* gnu/packages/patches/aws-c-compression-cmake-prefix.patch:
Delete file.
* gnu/local.mk: Remove it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                              |  1 -
 gnu/packages/c.scm                                        | 10 ++++++----
 gnu/packages/patches/aws-c-compression-cmake-prefix.patch | 13 -------------
 3 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 gnu/packages/patches/aws-c-compression-cmake-prefix.patch

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index 654d7d6c40..b8361728fa 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -872,7 +872,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/awesome-reproducible-png.patch		\
   %D%/packages/patches/aws-c-auth-cmake-prefix.patch		\
   %D%/packages/patches/aws-c-auth-disable-networking-tests.patch\
-  %D%/packages/patches/aws-c-compression-cmake-prefix.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		\
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 2b80303170..753b145497 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -750,7 +750,8 @@ specifications.")
 (define-public aws-c-compression
   (package
     (name "aws-c-compression")
-    (version "0.2.13")
+    ; Update only when updating aws-crt-cpp.
+    (version "0.2.14")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -759,12 +760,13 @@ specifications.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0zqfxi0fdgapfsfgvsindv63pq7vyl1s376qkpv4jgflyb1v6gp5"))
-              (patches (search-patches "aws-c-compression-cmake-prefix.patch"))))
+                "0fs3zhhzxsb9nfcjpvfbcq79hal7si2ia1c09scab9a8m264f4vd"))))
     (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")))))
     (propagated-inputs
      `(("aws-c-common" ,aws-c-common)))
     (synopsis "Amazon Web Services compression library")
diff --git a/gnu/packages/patches/aws-c-compression-cmake-prefix.patch b/gnu/packages/patches/aws-c-compression-cmake-prefix.patch
deleted file mode 100644
index eefae19c4a..0000000000
--- a/gnu/packages/patches/aws-c-compression-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,6 +5,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()
-- 
cgit v1.2.3


From 05be89ac5b592c798976d97dce920734b7e7fa55 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 17:43:35 +0000
Subject: gnu: aws-c-auth: Update to 0.6.4.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/c.scm (aws-c-auth): Update to 0.6.4.
[arguments]: Fix CMAKE_PREFIX_PATH, disable network tests.
[source]: Add and remove patches.
* gnu/packages/patches/aws-c-auth-install-private-headers.patch:
New file.
* gnu/packages/patches/aws-c-auth-cmake-prefix.patch,
gnu/packages/patches/aws-c-auth-disable-networking-tests.patch:
Delete files.
* gnu/local.mk: Add and remove them.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                       |  3 +-
 gnu/packages/c.scm                                 | 13 +++--
 gnu/packages/patches/aws-c-auth-cmake-prefix.patch | 13 -----
 .../aws-c-auth-disable-networking-tests.patch      | 64 ----------------------
 .../aws-c-auth-install-private-headers.patch       | 19 +++++++
 5 files changed, 28 insertions(+), 84 deletions(-)
 delete mode 100644 gnu/packages/patches/aws-c-auth-cmake-prefix.patch
 delete mode 100644 gnu/packages/patches/aws-c-auth-disable-networking-tests.patch
 create mode 100644 gnu/packages/patches/aws-c-auth-install-private-headers.patch

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index b8361728fa..20bf432947 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -870,8 +870,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/avahi-localstatedir.patch		\
   %D%/packages/patches/avidemux-install-to-lib.patch		\
   %D%/packages/patches/awesome-reproducible-png.patch		\
-  %D%/packages/patches/aws-c-auth-cmake-prefix.patch		\
-  %D%/packages/patches/aws-c-auth-disable-networking-tests.patch\
+  %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		\
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 753b145497..9a4f7a304d 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -779,7 +779,8 @@ currently limited to Huffman encoding and decoding.")
 (define-public aws-c-auth
   (package
     (name "aws-c-auth")
-    (version "0.6.0")
+    ; Update only when updating aws-crt-cpp.
+    (version "0.6.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -788,15 +789,17 @@ currently limited to Huffman encoding and decoding.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0yh9s6q3ahq39xgvihp2a5cn9h39qlq8wfjc32m0ayi9x739rbqg"))
+                "120p69lj279yq3d2b81f45kgfrvf32j6m7s03m8hh27w8yd4vbfp"))
               (patches
                (search-patches
-                "aws-c-auth-cmake-prefix.patch"
-                "aws-c-auth-disable-networking-tests.patch"))))
+                "aws-c-auth-install-private-headers.patch"))))
     (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-cal" ,aws-c-cal)
        ("aws-c-common" ,aws-c-common)
diff --git a/gnu/packages/patches/aws-c-auth-cmake-prefix.patch b/gnu/packages/patches/aws-c-auth-cmake-prefix.patch
deleted file mode 100644
index da3e4eb4a5..0000000000
--- a/gnu/packages/patches/aws-c-auth-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-auth-disable-networking-tests.patch b/gnu/packages/patches/aws-c-auth-disable-networking-tests.patch
deleted file mode 100644
index 905247f528..0000000000
--- a/gnu/packages/patches/aws-c-auth-disable-networking-tests.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -19,8 +19,8 @@ add_test_case(profile_credentials_provider_environment_test)
- add_test_case(credentials_provider_first_in_chain_test)
- add_test_case(credentials_provider_second_in_chain_test)
- add_test_case(credentials_provider_null_chain_test)
--add_test_case(credentials_provider_default_basic_test)
--add_test_case(credentials_provider_default_manual_tls_test)
-+#add_test_case(credentials_provider_default_basic_test)
-+#add_test_case(credentials_provider_default_manual_tls_test)
- add_test_case(credentials_provider_imds_new_destroy)
- add_test_case(credentials_provider_imds_connect_failure)
- add_test_case(credentials_provider_imds_token_request_failure)
-@@ -58,28 +58,28 @@ add_test_case(credentials_provider_x509_basic_success)
- add_test_case(credentials_provider_x509_success_multi_part_doc)
- add_test_case(credentials_provider_x509_real_new_destroy)
- 
--add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_env)
--add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_config)
--add_net_test_case(credentials_provider_sts_web_identity_new_failed_without_env_and_config)
--add_net_test_case(credentials_provider_sts_web_identity_connect_failure)
--add_net_test_case(credentials_provider_sts_web_identity_request_failure)
--add_net_test_case(credentials_provider_sts_web_identity_bad_document_failure)
--add_net_test_case(credentials_provider_sts_web_identity_test_retry_error1)
--add_net_test_case(credentials_provider_sts_web_identity_test_retry_error2)
--add_net_test_case(credentials_provider_sts_web_identity_basic_success_env)
--add_net_test_case(credentials_provider_sts_web_identity_basic_success_config)
--add_net_test_case(credentials_provider_sts_web_identity_success_multi_part_doc)
--add_net_test_case(credentials_provider_sts_web_identity_real_new_destroy)
--
--add_net_test_case(credentials_provider_sts_direct_config_succeeds)
--add_net_test_case(credentials_provider_sts_direct_config_succeeds_after_retry)
--add_net_test_case(credentials_provider_sts_direct_config_invalid_doc)
--add_net_test_case(credentials_provider_sts_direct_config_connection_failed)
--add_net_test_case(credentials_provider_sts_direct_config_service_fails)
--add_net_test_case(credentials_provider_sts_from_profile_config_succeeds)
--add_net_test_case(credentials_provider_sts_from_profile_config_manual_tls_succeeds)
--add_net_test_case(credentials_provider_sts_from_profile_config_environment_succeeds)
--add_net_test_case(credentials_provider_sts_cache_expiration_conflict)
-+#add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_env)
-+#add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_config)
-+#add_net_test_case(credentials_provider_sts_web_identity_new_failed_without_env_and_config)
-+#add_net_test_case(credentials_provider_sts_web_identity_connect_failure)
-+#add_net_test_case(credentials_provider_sts_web_identity_request_failure)
-+#add_net_test_case(credentials_provider_sts_web_identity_bad_document_failure)
-+#add_net_test_case(credentials_provider_sts_web_identity_test_retry_error1)
-+#add_net_test_case(credentials_provider_sts_web_identity_test_retry_error2)
-+#add_net_test_case(credentials_provider_sts_web_identity_basic_success_env)
-+#add_net_test_case(credentials_provider_sts_web_identity_basic_success_config)
-+#add_net_test_case(credentials_provider_sts_web_identity_success_multi_part_doc)
-+#add_net_test_case(credentials_provider_sts_web_identity_real_new_destroy)
-+
-+#add_net_test_case(credentials_provider_sts_direct_config_succeeds)
-+#add_net_test_case(credentials_provider_sts_direct_config_succeeds_after_retry)
-+#add_net_test_case(credentials_provider_sts_direct_config_invalid_doc)
-+#add_net_test_case(credentials_provider_sts_direct_config_connection_failed)
-+#add_net_test_case(credentials_provider_sts_direct_config_service_fails)
-+#add_net_test_case(credentials_provider_sts_from_profile_config_succeeds)
-+#add_net_test_case(credentials_provider_sts_from_profile_config_manual_tls_succeeds)
-+#add_net_test_case(credentials_provider_sts_from_profile_config_environment_succeeds)
-+#add_net_test_case(credentials_provider_sts_cache_expiration_conflict)
- 
- add_test_case(credentials_provider_process_new_destroy_from_config)
- add_test_case(credentials_provider_process_new_failed)
diff --git a/gnu/packages/patches/aws-c-auth-install-private-headers.patch b/gnu/packages/patches/aws-c-auth-install-private-headers.patch
new file mode 100644
index 0000000000..990fd6f2eb
--- /dev/null
+++ b/gnu/packages/patches/aws-c-auth-install-private-headers.patch
@@ -0,0 +1,19 @@
+aws-sdk-cpp depends on the private headers from aws-c-auth. This dependency was
+added to aws-sdk-cpp in commit 23cca02c2df on 2021-06-04.
+
+The following error is generated when building aws-sdk-cpp when the private
+aws-c-auth headers are not installed:
+
+/tmp/guix-build-aws-sdk-cpp-1.9.121.drv-0/aws-sdk-cpp-1.9.121-checkout/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp:17:10: fatal error: aws/auth/private/aws_signing.h: No such file or directory
+ #include <aws/auth/private/aws_signing.h>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,6 +114,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS} ${PLATFORM_LIBS})
+ aws_prepare_shared_lib_exports(${PROJECT_NAME})
+ 
+ install(FILES ${AWS_AUTH_ROOT_HEADERS} DESTINATION "include/aws/auth" COMPONENT Development)
++install(FILES ${AWS_AUTH_PRIVATE_HEADERS} DESTINATION "include/aws/auth/private" COMPONENT Development)
+ 
+ if (BUILD_SHARED_LIBS)
+    set (TARGET_DIR "shared")
-- 
cgit v1.2.3


From 2d613547888c7578d56b7920e8b31946cd324c49 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 17:47:41 +0000
Subject: gnu: aws-c-s3: Update to 0.1.26.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                       |   2 -
 gnu/packages/c.scm                                 |  14 +-
 gnu/packages/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

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index 20bf432947..b24fd01e10 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 9a4f7a304d..ecf79bd2cf 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -815,7 +815,8 @@ authentication.")
 (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 @@ authentication.")
               (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)
-- 
cgit v1.2.3


From d5c9f52a37ee782888f6db2e5a7e5f34153a2054 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 17:53:16 +0000
Subject: gnu: aws-c-mqtt: Replace patch.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/c.scm (aws-c-mqtt): Replace patch.
[arguments]: Fix CMAKE_PREFIX_PATH.
[source]: Remove patch.
* gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch: Delete file.
* gnu/local.mk: Remove it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                       |  1 -
 gnu/packages/c.scm                                 |  8 +++++---
 gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch | 13 -------------
 3 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index b24fd01e10..1bbe6bcf39 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -872,7 +872,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/awesome-reproducible-png.patch		\
   %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-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 ecf79bd2cf..3b10579ee7 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -846,6 +846,7 @@ Service (S3) protocol for object storage.")
 (define-public aws-c-mqtt
   (package
     (name "aws-c-mqtt")
+    ; Update only when updating aws-crt-cpp.
     (version "0.7.8")
     (source (origin
               (method git-fetch)
@@ -855,12 +856,13 @@ Service (S3) protocol for object storage.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"))
-              (patches (search-patches "aws-c-mqtt-cmake-prefix.patch"))))
+                "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"))))
     (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")))))
     (propagated-inputs
      `(("aws-c-http" ,aws-c-http)
        ("aws-c-io" ,aws-c-io)))
diff --git a/gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch b/gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch
deleted file mode 100644
index 987024b57c..0000000000
--- a/gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,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()
-- 
cgit v1.2.3


From 37db6db2841e7e5c9be54dd198964046a53d2c71 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 17:57:53 +0000
Subject: gnu: aws-crt-cpp: Update to 0.17.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/c.scm (aws-crt-cpp): Update to 0.17.1.
[arguments]: Fix CMAKE_PREFIX_PATH, disable network tests.
[source]: Remove patches.
* gnu/packages/patches/aws-crt-cpp-cmake-prefix.patch,
gnu/packages/patches/aws-crt-cpp-disable-networking-tests.patch:
Delete files.
* gnu/local.mk: Remove them.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                       |  2 -
 gnu/packages/cpp.scm                               | 20 ++++-----
 .../patches/aws-crt-cpp-cmake-prefix.patch         | 13 ------
 .../aws-crt-cpp-disable-networking-tests.patch     | 47 ----------------------
 4 files changed, 11 insertions(+), 71 deletions(-)
 delete mode 100644 gnu/packages/patches/aws-crt-cpp-cmake-prefix.patch
 delete mode 100644 gnu/packages/patches/aws-crt-cpp-disable-networking-tests.patch

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index 1bbe6bcf39..a43e1a2d7b 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-checksums-cmake-prefix.patch		\
-  %D%/packages/patches/aws-crt-cpp-cmake-prefix.patch		\
-  %D%/packages/patches/aws-crt-cpp-disable-networking-tests.patch	\
   %D%/packages/patches/aws-sdk-cpp-cmake-prefix.patch		\
   %D%/packages/patches/aws-sdk-cpp-disable-networking-tests.patch	\
   %D%/packages/patches/aws-sdk-cpp-disable-werror.patch		\
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index d7a83ae727..53fa11beca 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -900,11 +900,14 @@ of C++14 components that complements @code{std} and Boost.")
     (license license:asl2.0)))
 
 (define-public aws-crt-cpp
-  (let* ((commit "c2d6ffa5597825111cc76ad71ffc6aef664d0f25")
+  (let* ((commit "b6d311d76b504bf8ace5134d3fca0e672c36c9c3")
          (revision "1"))
     (package
       (name "aws-crt-cpp")
-      (version (git-version "0.14.2" revision commit))
+      ; Update only when updating aws-sdk-cpp, and when updating also update
+      ; versions of library dependencies linked from from
+      ; https://github.com/awslabs/aws-crt-cpp/tree/{aws-crt-cpp commit}/crt
+      (version (git-version "0.17.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -913,16 +916,15 @@ of C++14 components that complements @code{std} and Boost.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0l7iwynk2rgzjnr1hi1raazghmk4m7pj47vdq2kf2cfz0b6v9jf5"))
-                (patches
-                 (search-patches
-                  "aws-crt-cpp-cmake-prefix.patch"
-                  "aws-crt-cpp-disable-networking-tests.patch"))))
+                  "1n0nlbz91j3ycwwrh9652f0h5qr2sj5b1l0i5sg40ajzs7wvzd32"))))
       (build-system cmake-build-system)
       (arguments
        '(#:configure-flags
-         '("-DBUILD_SHARED_LIBS=ON"
-           "-DBUILD_DEPS=OFF")))
+         (list "-DBUILD_DEPS=OFF"
+               "-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-cal" ,aws-c-cal)
diff --git a/gnu/packages/patches/aws-crt-cpp-cmake-prefix.patch b/gnu/packages/patches/aws-crt-cpp-cmake-prefix.patch
deleted file mode 100644
index b45818875f..0000000000
--- a/gnu/packages/patches/aws-crt-cpp-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,6 +39,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- include(AwsCheckHeadersCxx)
- include(CTest)
- 
-+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-crt-cpp-disable-networking-tests.patch b/gnu/packages/patches/aws-crt-cpp-disable-networking-tests.patch
deleted file mode 100644
index 4c1be7d028..0000000000
--- a/gnu/packages/patches/aws-crt-cpp-disable-networking-tests.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -13,9 +13,9 @@ add_test_case(ApiMultiDefaultCreateDestroy)
- add_test_case(EventLoopResourceSafety)
- add_test_case(ClientBootstrapResourceSafety)
- if (NOT BYO_CRYPTO)
--    add_net_test_case(MqttClientResourceSafety)
-+    #add_net_test_case(MqttClientResourceSafety)
-     add_net_test_case(MqttClientNewConnectionUninitializedTlsContext)
--    add_net_test_case(TLSContextResourceSafety)
-+    #add_net_test_case(TLSContextResourceSafety)
-     add_net_test_case(TLSContextUninitializedNewConnectionOptions)
- endif ()
- add_test_case(Base64RoundTrip)
-@@ -29,15 +29,15 @@ add_test_case(SHA256ResourceSafety)
- add_test_case(MD5ResourceSafety)
- add_test_case(SHA256HMACResourceSafety)
- if (NOT BYO_CRYPTO)
--    add_net_test_case(HttpDownloadNoBackPressureHTTP1_1)
--    add_net_test_case(HttpDownloadNoBackPressureHTTP2)
--    add_net_test_case(HttpStreamUnActivated)
-+    #add_net_test_case(HttpDownloadNoBackPressureHTTP1_1)
-+    #add_net_test_case(HttpDownloadNoBackPressureHTTP2)
-+    #add_net_test_case(HttpStreamUnActivated)
-     add_net_test_case(HttpCreateConnectionInvalidTlsConnectionOptions)
-     add_net_test_case(IotPublishSubscribe)
--    add_net_test_case(HttpClientConnectionManagerResourceSafety)
-+    #add_net_test_case(HttpClientConnectionManagerResourceSafety)
-     add_net_test_case(HttpClientConnectionManagerInvalidTlsConnectionOptions)
--    add_net_test_case(HttpClientConnectionWithPendingAcquisitions)
--    add_net_test_case(HttpClientConnectionWithPendingAcquisitionsAndClosedConnections)
-+    #add_net_test_case(HttpClientConnectionWithPendingAcquisitions)
-+    #add_net_test_case(HttpClientConnectionWithPendingAcquisitionsAndClosedConnections)
- endif ()
- add_test_case(DefaultResolution)
- add_test_case(OptionalCopySafety)
-@@ -55,8 +55,8 @@ add_test_case(TestProviderEnvironmentGet)
- add_test_case(TestProviderProfileGet)
- add_test_case(TestProviderImdsGet)
- if (NOT BYO_CRYPTO)
--    add_net_test_case(TestProviderDefaultChainGet)
--    add_net_test_case(TestProviderDefaultChainManualTlsContextGet)
-+    #add_net_test_case(TestProviderDefaultChainGet)
-+    #add_net_test_case(TestProviderDefaultChainManualTlsContextGet)
- endif ()
- add_test_case(TestProviderDelegateGet)
- add_test_case(HttpRequestTestCreateDestroy)
-- 
cgit v1.2.3


From c769b8c2b5bf97cf9aaaa9b151012763355b1f66 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 18:08:57 +0000
Subject: gnu: aws-sdk-cpp: Update to 1.9.136.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/cpp.scm (aws-sdk-cpp): Update to 1.9.136.
[arguments]: Fix CMAKE_PREFIX_PATH.
[source]: Remove patches.
* gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch,
gnu/packages/patches/aws-sdk-cpp-disable-network-tests.patch,
gnu/packages/patches/aws-sdk-cpp-disable-werror.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                       |  3 --
 gnu/packages/cpp.scm                               | 17 ++++-----
 .../patches/aws-sdk-cpp-cmake-prefix.patch         | 18 ---------
 .../aws-sdk-cpp-disable-networking-tests.patch     | 44 ----------------------
 .../patches/aws-sdk-cpp-disable-werror.patch       | 11 ------
 5 files changed, 8 insertions(+), 85 deletions(-)
 delete mode 100644 gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch
 delete mode 100644 gnu/packages/patches/aws-sdk-cpp-disable-networking-tests.patch
 delete mode 100644 gnu/packages/patches/aws-sdk-cpp-disable-werror.patch

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index a43e1a2d7b..8f57eba56a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -873,9 +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-checksums-cmake-prefix.patch		\
-  %D%/packages/patches/aws-sdk-cpp-cmake-prefix.patch		\
-  %D%/packages/patches/aws-sdk-cpp-disable-networking-tests.patch	\
-  %D%/packages/patches/aws-sdk-cpp-disable-werror.patch		\
   %D%/packages/patches/azr3.patch				\
   %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch	\
   %D%/packages/patches/bash-completion-directories.patch	\
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 53fa11beca..72bb5bcda5 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -943,7 +943,9 @@ aws-c-http, aws-c-io, aws-c-mqtt, aws-checksums, and s2n.")
 (define-public aws-sdk-cpp
   (package
     (name "aws-sdk-cpp")
-    (version "1.9.92")
+    ; When updating also check for a tagged update to aws-crt-cpp from
+    ; https://github.com/aws/aws-sdk-cpp/tree/main/crt
+    (version "1.9.136")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -952,19 +954,16 @@ aws-c-http, aws-c-io, aws-c-mqtt, aws-checksums, and s2n.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0nbq1qivykfg8jmrn8d0k6fcfa5dw9s90wnwddh7ia4zafmby7pd"))
-              (patches
-               (search-patches
-                "aws-sdk-cpp-cmake-prefix.patch"
-                "aws-sdk-cpp-disable-networking-tests.patch"
-                "aws-sdk-cpp-disable-werror.patch"))))
+                "0ap7g7nmbnrcajy3b788bnpqd87dwmg83dhll1q8qzli04bcg47i"))))
     (build-system cmake-build-system)
     (arguments
      '(;; Tests are run during the build phase.
        #:tests? #f
        #:configure-flags
-       '("-DBUILD_SHARED_LIBS=ON"
-         "-DBUILD_DEPS=OFF")))
+       (list "-DBUILD_DEPS=OFF"
+             "-DBUILD_SHARED_LIBS=ON"
+             (string-append "-DCMAKE_PREFIX_PATH="
+                            (assoc-ref %build-inputs "aws-c-common")))))
     (propagated-inputs
      `(("aws-crt-cpp" ,aws-crt-cpp)))
     (inputs
diff --git a/gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch b/gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch
deleted file mode 100644
index efc1218834..0000000000
--- a/gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -98,9 +98,13 @@ set(PYTHON_CMD "python")
- # CMAKE_MODULE_PATH is a CMAKE variable. It contains a list of paths
- # which could be used to search CMAKE modules by "include()" or "find_package()", but the default value is empty.
- # Add ${CMAKE_INSTALL_LIBDIR}/cmake and ${CMAKE_PREFIX_PATH}/lib/cmake to search list
-+if (DEFINED ENV{CMAKE_PREFIX_PATH})
-+    set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
-+endif()
-+
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
--set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
--string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
-+set(AWS_MODULE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake")
-+string(REPLACE ":" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
- list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
- 
- # include() will "load and run" cmake script
diff --git a/gnu/packages/patches/aws-sdk-cpp-disable-networking-tests.patch b/gnu/packages/patches/aws-sdk-cpp-disable-networking-tests.patch
deleted file mode 100644
index 3b582d9628..0000000000
--- a/gnu/packages/patches/aws-sdk-cpp-disable-networking-tests.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp
-+++ b/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp
-@@ -92,12 +92,12 @@ TEST(HttpClientTest, TestRandomURLWithNoProxy)
-     makeRandomHttpRequest(httpClient, false);
- }
- 
--TEST(HttpClientTest, TestRandomURLWithProxy)
--{
--    ClientConfiguration configuration = makeClientConfigurationWithProxy();
--    auto httpClient = CreateHttpClient(configuration);
--    makeRandomHttpRequest(httpClient, true); // we expect it to try to use proxy that is invalid
--}
-+//TEST(HttpClientTest, TestRandomURLWithProxy)
-+//{
-+//    ClientConfiguration configuration = makeClientConfigurationWithProxy();
-+//    auto httpClient = CreateHttpClient(configuration);
-+//    makeRandomHttpRequest(httpClient, true); // we expect it to try to use proxy that is invalid
-+//}
- 
- TEST(HttpClientTest, TestRandomURLWithProxyAndDeclaredAsNonProxyHost)
- {
-@@ -119,14 +119,14 @@ TEST(HttpClientTest, TestRandomURLWithProxyAndDeclaredParentDomainAsNonProxyHost
-     makeRandomHttpRequest(httpClient, false);
- }
- 
--TEST(HttpClientTest, TestRandomURLWithProxyAndOtherDeclaredAsNonProxyHost)
--{
--    ClientConfiguration configuration = makeClientConfigurationWithProxy();
--    configuration.nonProxyHosts = Aws::Utils::Array<Aws::String>(1);
--    configuration.nonProxyHosts[0] = "http://test.non.filtered.aws";
--    auto httpClient = CreateHttpClient(configuration);
--    makeRandomHttpRequest(httpClient, true);
--}
-+//TEST(HttpClientTest, TestRandomURLWithProxyAndOtherDeclaredAsNonProxyHost)
-+//{
-+//    ClientConfiguration configuration = makeClientConfigurationWithProxy();
-+//    configuration.nonProxyHosts = Aws::Utils::Array<Aws::String>(1);
-+//    configuration.nonProxyHosts[0] = "http://test.non.filtered.aws";
-+//    auto httpClient = CreateHttpClient(configuration);
-+//    makeRandomHttpRequest(httpClient, true);
-+//}
- 
- // TODO: Pending Fix on Windows.
- #if ENABLE_CURL_CLIENT
diff --git a/gnu/packages/patches/aws-sdk-cpp-disable-werror.patch b/gnu/packages/patches/aws-sdk-cpp-disable-werror.patch
deleted file mode 100644
index 249c299239..0000000000
--- a/gnu/packages/patches/aws-sdk-cpp-disable-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/compiler_settings.cmake
-+++ b/cmake/compiler_settings.cmake
-@@ -53,7 +53,7 @@ macro(set_gcc_flags)
- endmacro()
- 
- macro(set_gcc_warnings)
--    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra")
-+    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-pedantic" "-Wextra")
-     if(COMPILER_CLANG)
-         if(PLATFORM_ANDROID)
-             # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning.
-- 
cgit v1.2.3


From 963ebbc62c1b2eee49f5b00ecd5fb8e11dbbdced Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 18:35:11 +0000
Subject: gnu: aws-c-event-stream: Replace patch.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/c.scm (aws-c-event-stream): Replace patch.
[arguments]: Fix CMAKE_PREFIX_PATH.
[source]: Remove patch.
* gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch:
Delete file.
* gnu/local.mk: Remove it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                               |  1 -
 gnu/packages/c.scm                                         |  8 +++++---
 gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch | 13 -------------
 3 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index 8f57eba56a..5f035aae8e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -871,7 +871,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/avidemux-install-to-lib.patch		\
   %D%/packages/patches/awesome-reproducible-png.patch		\
   %D%/packages/patches/aws-c-auth-install-private-headers.patch	\
-  %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch  \
   %D%/packages/patches/aws-checksums-cmake-prefix.patch		\
   %D%/packages/patches/azr3.patch				\
   %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch	\
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 3b10579ee7..34c87c2d4b 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -605,6 +605,7 @@ with fallback to efficient C99 software implementations.")
 (define-public aws-c-event-stream
   (package
     (name "aws-c-event-stream")
+    ; Update only when updating aws-crt-cpp.
     (version "0.2.7")
     (source (origin
               (method git-fetch)
@@ -614,12 +615,13 @@ with fallback to efficient C99 software implementations.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh"))
-              (patches (search-patches "aws-c-event-stream-cmake-prefix.patch"))))
+                "0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh"))))
     (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")))))
     (propagated-inputs
      `(("aws-c-common" ,aws-c-common)
        ("aws-c-io" ,aws-c-io)
diff --git a/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch b/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch
deleted file mode 100644
index 79655a910b..0000000000
--- a/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,6 +3,10 @@
- cmake_minimum_required (VERSION 3.1)
- project (aws-c-event-stream C)
- 
-+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()
-- 
cgit v1.2.3


From 14f540593bd95bb78ea68373babdc04a862dd561 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Mon, 18 Oct 2021 18:39:15 +0000
Subject: gnu: aws-checksums: Replace patch.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/c.scm (aws-checksums): Replace patch.
[arguments]: Fix CMAKE_PREFIX_PATH.
[source]: Remove patch.
* gnu/packages/patches/aws-checksums-cmake-prefix.patch:
Delete file.
* gnu/local.mk: Remove it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                          |  1 -
 gnu/packages/c.scm                                    |  8 +++++---
 gnu/packages/patches/aws-checksums-cmake-prefix.patch | 13 -------------
 3 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 gnu/packages/patches/aws-checksums-cmake-prefix.patch

(limited to 'gnu/local.mk')

diff --git a/gnu/local.mk b/gnu/local.mk
index 5f035aae8e..6aada7326b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -871,7 +871,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/avidemux-install-to-lib.patch		\
   %D%/packages/patches/awesome-reproducible-png.patch		\
   %D%/packages/patches/aws-c-auth-install-private-headers.patch	\
-  %D%/packages/patches/aws-checksums-cmake-prefix.patch		\
   %D%/packages/patches/azr3.patch				\
   %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch	\
   %D%/packages/patches/bash-completion-directories.patch	\
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 34c87c2d4b..e37c173fc0 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -578,6 +578,7 @@ portability.")
 (define-public aws-checksums
   (package
     (name "aws-checksums")
+    ; Update only when updating aws-crt-cpp.
     (version "0.1.12")
     (source (origin
               (method git-fetch)
@@ -587,12 +588,13 @@ portability.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "054f2hkmkxhw83q7zsz349k82xk6bkrvlsab088pf7kn9wd4hy4k"))
-              (patches (search-patches "aws-checksums-cmake-prefix.patch"))))
+                "054f2hkmkxhw83q7zsz349k82xk6bkrvlsab088pf7kn9wd4hy4k"))))
     (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")))))
     (inputs
      `(("aws-c-common" ,aws-c-common)))
     (synopsis "Amazon Web Services checksum library")
diff --git a/gnu/packages/patches/aws-checksums-cmake-prefix.patch b/gnu/packages/patches/aws-checksums-cmake-prefix.patch
deleted file mode 100644
index f6a5c9ad9c..0000000000
--- a/gnu/packages/patches/aws-checksums-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,6 +8,10 @@
-     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()
-- 
cgit v1.2.3