03/15: gnu: zstd: Absorb grafted replacement.

[guix-commits]

lfam pushed a commit to branch wip-ungrafting
in repository guix.

commit 0875277a25d3481c809361d9358a3788e5cc1347
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Mon May 17 11:27:13 2021 -0400

    gnu: zstd: Absorb grafted replacement.
    
    * gnu/packages/compression.scm (zstd)[source]: Use
    "zstd-CVE-2021-24031_CVE-2021-24032.patch".
    [replacement]: Remove field.
    (zstd/fixed): Remove variable.
---
 gnu/packages/compression.scm | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 3dbe517..ef42340 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1432,9 +1432,9 @@ or junctions, and always follows hard links.")
        (method url-fetch)
        (uri (string-append 
"https://github.com/facebook/zstd/releases/download/";
                            "v" version "/zstd-" version ".tar.gz"))
+       (patches (search-patches "zstd-CVE-2021-24031_CVE-2021-24032.patch"))
        (sha256
         (base32 "05ckxap00qvc0j51d3ci38150cxsw82w7s9zgd5fgzspnzmp1vsr"))))
-    (replacement zstd/fixed)
     (build-system gnu-build-system)
     (outputs '("out"                    ;1.2MiB executables and documentation
                "lib"                    ;1.2MiB shared library and headers
@@ -1494,17 +1494,6 @@ speed.")
                    license:public-domain ; zlibWrapper/examples/fitblk*
                    license:zlib))))      ; zlibWrapper/{gz*.c,gzguts.h}
 
-(define zstd/fixed
-  (package
-    (inherit zstd)
-    (source
-     (origin
-       (inherit (package-source zstd))
-       (patches
-        (search-patches
-         ;; From Ubuntu focal-security
-         "zstd-CVE-2021-24031_CVE-2021-24032.patch"))))))
-
 (define-public pzstd
   (package/inherit zstd
     (name "pzstd")