11/14: gnu: Explicitly use OpenSSL 1.1 in more packages.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 50134a2b4ad0e0d0af2b4aff8e8a2c940c02a6a0
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Aug 31 08:55:23 2022 +0200

    gnu: Explicitly use OpenSSL 1.1 in more packages.
    
    * gnu/packages/rust-apps.scm (rust-cargo-c)[inputs]: Change from OPENSSL to
    OPENSSL-1.1.
    * gnu/packages/security-token.scm (opensc)[inputs]: Likewise.
    * gnu/packages/spice.scm (spice, spice-gtk)[propagated-inputs]: Likewise.
    * gnu/packages/web.scm (serf)[propagated-inputs]: Likewise.
---
 gnu/packages/rust-apps.scm      | 2 +-
 gnu/packages/security-token.scm | 2 +-
 gnu/packages/spice.scm          | 4 ++--
 gnu/packages/web.scm            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 7d84516c83..b89eff4eb0 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1659,7 +1659,7 @@ support for Rust.")
     (native-inputs
      (list pkg-config))
     (inputs
-     (list curl libgit2-1.3 libssh2 openssl zlib))
+     (list curl libgit2-1.3 libssh2 openssl-1.1 zlib))
     (home-page "https://github.com/lu-zero/cargo-c";)
     (synopsis "Build and install C-compatible libraries")
     (description
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 2db387b0aa..6e94bfa534 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -310,7 +310,7 @@ website for more information about Yubico and the YubiKey.")
                   (string-append
                    "DEFAULT_PCSC_PROVIDER=\"" libpcsclite "\"")))))))))
     (inputs
-     (list readline openssl pcsc-lite ccid))
+     (list readline openssl-1.1 pcsc-lite ccid))
     (native-inputs
      (list libxslt docbook-xsl pkg-config))
     (home-page "https://github.com/OpenSC/OpenSC/wiki";)
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index b0bf2bc939..7ac82e5115 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -149,7 +149,7 @@ which allows users to view a desktop computing 
environment.")
             ;; These are required by the pkg-config files.
             gtk+
             pixman
-            openssl))
+            openssl-1.1))
     (inputs
       `(("glib-networking" ,glib-networking)
         ("gobject-introspection" ,gobject-introspection)
@@ -221,7 +221,7 @@ which allows users to view a desktop computing 
environment.")
                 "1xd0xffw0g5vvwbq4ksmm3jjfq45f9dw20xpmi82g1fj9f7wy85k"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      (list openssl pixman spice-protocol))
+      (list openssl-1.1 pixman spice-protocol))
     (inputs
       (list cyrus-sasl
             glib
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b687e4e3e7..dd9540a9cb 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1938,7 +1938,7 @@ from streaming URLs.  It is a command-line wrapper for 
the libquvi library.")
         (base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"))))
     (build-system scons-build-system)
     (propagated-inputs
-     (list apr apr-util openssl))
+     (list apr apr-util openssl-1.1))
     (inputs
      (list ;; TODO: Fix build with gss.
            ;;("gss" ,gss)