09/09: gnu: sudo: Update to 1.9.11p1.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit ce21522706ce9603eab0da9eb568ceda9c19cd1a
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jun 5 02:00:00 2022 +0200

    gnu: sudo: Update to 1.9.11p1.
    
    * gnu/packages/admin.scm (sudo): Update to 1.9.11p1.
    [source]: Remove patch again.
    * gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/admin.scm                             |  5 ++---
 .../sudo-missing-sudo_pt_regs-aarch64.patch        | 26 ----------------------
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 26866bc807..453d3bb9a9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1805,7 +1805,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/slim-reset.patch                                \
   %D%/packages/patches/slim-login.patch                                \
   %D%/packages/patches/slim-display.patch                      \
-  %D%/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch \
   %D%/packages/patches/syslinux-gcc10.patch                    \
   %D%/packages/patches/syslinux-strip-gnu-property.patch       \
   %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch      \
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 9a3ddab227..6acfff8881 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1769,7 +1769,7 @@ system administrator.")
 (define-public sudo
   (package
     (name "sudo")
-    (version "1.9.11")
+    (version "1.9.11p1")
     (source (origin
               (method url-fetch)
               (uri
@@ -1779,8 +1779,7 @@ system administrator.")
                                     version ".tar.gz")))
               (sha256
                (base32
-                "1gjingc1h7d6p17m0nn87yiwh8gbdchg4w4kv8s4g89wv0q6wixm"))
-              (patches (search-patches 
"sudo-missing-sudo_pt_regs-aarch64.patch"))
+                "0jr52rmig9h367j0n6h3lp5xf54jsycnvdih42wg9bd9d4d6r2zb"))
               (modules '((guix build utils)))
               (snippet
                '(begin
diff --git a/gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch 
b/gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch
deleted file mode 100644
index 9caf607940..0000000000
--- a/gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d549adf04bfde7936306203e2e8886ffd93d00ea Mon Sep 17 00:00:00 2001
-From: Pierre Bourdon <delroth@gmail.com>
-Date: Tue, 7 Jun 2022 17:14:39 +0200
-Subject: [PATCH] exec_ptrace: fix missing sudo_pt_regs on aarch64
-
-AArch64 already had an existing "user_pt_regs" struct and didn't need a
-struct alias before the renaming to "sudo_pt_regs". Make the code build
-again by adding the now missing alias.
-
-Fixes: 2eb8ff17
----
- src/exec_ptrace.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/exec_ptrace.h b/src/exec_ptrace.h
-index 7f26283a8..4a5a86581 100644
---- a/src/exec_ptrace.h
-+++ b/src/exec_ptrace.h
-@@ -76,6 +76,7 @@
- # define reg_arg4(x)          (x).r10
- #elif defined(__aarch64__)
- # define SECCOMP_AUDIT_ARCH   AUDIT_ARCH_AARCH64
-+# define sudo_pt_regs         struct user_pt_regs
- # define reg_syscall(x)               (x).regs[8]     /* w8 */
- # define reg_retval(x)                (x).regs[0]     /* x0 */
- # define reg_sp(x)            (x).sp          /* sp */