guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: curl/fixed: Re-instate erroneously dropped p


From: guix-commits
Subject: branch master updated: gnu: curl/fixed: Re-instate erroneously dropped patch.
Date: Tue, 12 Nov 2024 07:06:55 -0500

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new b10ce47d8b gnu: curl/fixed: Re-instate erroneously dropped patch.
b10ce47d8b is described below

commit b10ce47d8be5b6c15987f4e1d93b3bd71b1eb220
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Nov 12 21:05:27 2024 +0900

    gnu: curl/fixed: Re-instate erroneously dropped patch.
    
    * gnu/packages/curl.scm (curl/fixed) [source]: Inherit base package patches,
    having the effect of re-adding 'curl-use-ssl-cert-env.patch'.
    
    Change-Id: I5c0fb5e44ad26cca9490cbbdef824011cffa9b2b
---
 gnu/packages/curl.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 96f993d99a..e5e3342b6d 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -185,7 +185,8 @@ tunneling, and so on.")
      (replacement curl/fixed)
      (source (origin
                (inherit (package-source curl))
-               (patches (search-patches "curl-CVE-2024-8096.patch")))))))
+               (patches (append (origin-patches (package-source curl))
+                                (search-patches 
"curl-CVE-2024-8096.patch"))))))))
 
 (define-public gnurl (deprecated-package "gnurl" curl))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]