diff options
author | Marius Bakke <marius@gnu.org> | 2022-08-11 22:15:22 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-08-11 22:15:22 +0200 |
commit | b50eaa67642ebc25e9c896f2e700c08610e0a5da (patch) | |
tree | e3358208e17a836c2e3cdb3125f815a2ab35c2b8 /gnu/packages/onc-rpc.scm | |
parent | 7b69cd07408bf64fff026e4597920a90259e3205 (diff) | |
parent | 99b73f60415b282f2be39134f385cbda4840c336 (diff) | |
download | guix-b50eaa67642ebc25e9c896f2e700c08610e0a5da.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/onc-rpc.scm')
-rw-r--r-- | gnu/packages/onc-rpc.scm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index f1cab94e08..873dc54c30 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ (package (name "libtirpc") (version "1.3.1") + (replacement libtirpc/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libtirpc/libtirpc/" @@ -74,7 +76,8 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).") (package/inherit libtirpc (name "libtirpc-hurd") (source (origin (inherit (package-source libtirpc)) - (patches (search-patches "libtirpc-hurd.patch")))) + (patches (search-patches "libtirpc-hurd.patch" + "libtirpc-CVE-2021-46828.patch")))) (arguments (substitute-keyword-arguments (package-arguments libtirpc) ((#:configure-flags flags ''()) @@ -83,6 +86,13 @@ 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") |