27/27: gnu: libtirpc: Incorporate grafted changes.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 307dec8e2d104be97313f273a4919ed1212652aa
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Aug 12 00:11:07 2022 +0200

    gnu: libtirpc: Incorporate grafted changes.
    
    * gnu/packages/onc-rpc.scm (libtirpc)[replacement]: Remove.
    (source)[patches]: New field.
    (libtirpc/fixed): Remove variable.
---
 gnu/packages/onc-rpc.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm
index 873dc54c30..3372dc5cd3 100644
--- a/gnu/packages/onc-rpc.scm
+++ b/gnu/packages/onc-rpc.scm
@@ -39,12 +39,12 @@
   (package
     (name "libtirpc")
     (version "1.3.1")
-    (replacement libtirpc/fixed)
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/libtirpc/libtirpc/"
                                   version "/libtirpc-"
                                   version ".tar.bz2"))
+              (patches (search-patches "libtirpc-CVE-2021-46828.patch"))
               (sha256
                (base32
                 "05zf16ilwwkzv4cccaac32nssrj3rg444n9pskiwbgk6y359an14"))))
@@ -86,13 +86,6 @@ IPv4 and IPv6.  ONC RPC is notably used by the network file 
system (NFS).")
                               (assoc-ref %build-inputs "mit-krb5")
                               "/bin/krb5-config")))))))
 
-(define libtirpc/fixed
-  (package
-    (inherit libtirpc)
-    (source (origin
-              (inherit (package-source libtirpc))
-              (patches (search-patches "libtirpc-CVE-2021-46828.patch"))))))
-
 (define-public rpcbind
   (package
     (name "rpcbind")