From 307dec8e2d104be97313f273a4919ed1212652aa Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Fri, 12 Aug 2022 00:11:07 +0200
Subject: 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")
-- 
cgit v1.2.3

c3f0526d969fee090a54f96'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/po/doc/guix-cookbook.sk.po'>
<input type='hidden' name='id' value='aeada768d7811a8c0c3f0526d969fee090a54f96'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=aeada768d7811a8c0c3f0526d969fee090a54f96'>root</a>/<a href='/guix/log/po?id=aeada768d7811a8c0c3f0526d969fee090a54f96'>po</a>/<a href='/guix/log/po/doc?id=aeada768d7811a8c0c3f0526d969fee090a54f96'>doc</a>/<a href='/guix/log/po/doc/guix-cookbook.sk.po?id=aeada768d7811a8c0c3f0526d969fee090a54f96'>guix-cookbook.sk.po</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/po/doc/guix-cookbook.sk.po?id=aeada768d7811a8c0c3f0526d969fee090a54f96&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-11-30 10:04:16 +0100'>2024-11-30</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=4a2c74b951c473772f5422d4fa7a68b0ff7ed75e'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>Change-Id: I2a2bdebc95c696b5040dd3fdb3f59dbef42d9e98
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2024-11-01 02:39:13 +0100'>2024-11-01</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=dd63cd7876f8c6a6eb42170219c17659ff4daf42'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>Change-Id: I15d674cd8e88250daa4284e8137a808c5298548f
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2024-07-12 18:16:48 +0200'>2024-07-12</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=ff82e0f7b48cd0d4dd906f5d52ba5d4940222086'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>Change-Id: I691cef365279ee5c50208a87ef5372a47152508e
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2024-06-03 00:27:12 +0200'>2024-06-03</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=834a4195241806784d4b321b95f06d85f458ce18'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.sv.po: New file.
* po/doc/local.mk: Add 'sv' cookbook.
* po/doc/po4a.cfg (po4a_langs): Add 'sv'.
* doc/local.mk: Add 'sv' cookbook.
* doc/htmlxref.cnf: Update URLs for cookbook.
* doc/build.scm (%cookbook-languages): Add 'sv'.
* doc/guix-cookbook.texi (Top): Mention 'sv' cookbook.

Change-Id: Ibfeb7254f583f1c8827e8c2756bbb02880bcba46
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2024-04-01 14:09:20 +0200'>2024-04-01</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=fa98837b1d9586b9ca7bf77dae22c3bde0fc59b5'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/guix/ar.po: New file.
* po/guix/LINGUAS: Add 'ar'.
* po/doc/guix-cookbook.pt_BR.po: New file.
* po/doc/local.mk: Add 'pt_BR' cookbook.
* doc/local.mk: Add 'pt_BR' cookbook.
* doc/htmlxref.cnf: Update URLs for cookbook.
* doc/build.scm (%cookbook-languages): Add 'ko', 'pt_BR'.
* doc/guix-cookbook.texi (Top): Mention 'ko', 'pt_BR' cookbook.

Change-Id: Id1846ca100263b3fc1fa2ed52654c670270ee809
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2023-08-31 21:36:03 +0200'>2023-08-31</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=57ab9536db20f98a36aeb25972137fbd752686cc'>nls: Update translations.</a></td><td>Florian Pelz</td></tr>
<tr><td><span title='2023-06-30 14:26:07 +0200'>2023-06-30</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=8af22b493199a17f46351c2f3d9f6ee759e48564'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/ja.po: New file.
* po/packages/LINGUAS: Add it.
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2023-05-31 17:23:21 +0200'>2023-05-31</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=8e9e6a6482f3ba98d1cdcad344ee488e8751fee7'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix-cookbook.texi (Top): Mention Slovak.
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2023-03-07 21:14:57 +0100'>2023-03-07</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=d333958763b0840c4cd895601b079b68358a6a46'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-12-04 22:25:23 +0100'>2022-12-04</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=2e75b328b6bbdadbffe5b643a4891b5026a0defd'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/packages/vi.po: New file.
po/packages/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-11-04 10:56:38 +0100'>2022-11-04</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=a65ce9dd500460af4f97e7398fb35dd817f4c677'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/guix/lt.po: New file.
* po/guix/LINGUAS: Add lt.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-08-10 23:32:24 +0200'>2022-08-10</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=aacbe59fbceb8a93ecb68fed8581dfdd70dafc11'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/guix/bn.po: New file.
po/guix/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-07-09 21:49:34 +0200'>2022-07-09</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=e0d47d8facafb6d6c04741bbf30eefbc68aaefb9'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/guix/tr.po: New file.
po/guix/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-06-04 17:42:54 +0200'>2022-06-04</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=809c57c872a6dd48007d1abf6d7f3dd1482ec53a'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/packages/tr.po: New file.
po/packages/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-05-01 18:07:34 +0200'>2022-05-01</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=6b4124cdcc203d47dc40158062afa1497d73d592'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/guix/ja.po: New file.
po/guix/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-04-02 18:42:36 +0200'>2022-04-02</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sk.po?id=8a208df17fe81fbf34f5a86cc52bb0b8e33c7b96'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/fi.po: New file.
* po/packages/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>