[packages/sudo] - rel 2, fix x32 build

baggins baggins at pld-linux.org
Sat Jun 11 21:40:16 CEST 2022


commit adfc2546a5a0a7d74ee489f4720005fc49e9bc1f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jun 11 21:40:03 2022 +0200

    - rel 2, fix x32 build

 sudo.spec |  4 +++-
 x32.patch | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/sudo.spec b/sudo.spec
index ed4ad27..907c0cf 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -30,7 +30,7 @@ Summary(uk.UTF-8):	Дозволяє вказаним користувачам в
 Name:		sudo
 # please see docs/UPGRADE.md for important changes each time updating sudo
 Version:	1.9.11p1
-Release:	1
+Release:	2
 Epoch:		1
 License:	BSD
 Group:		Applications/System
@@ -41,6 +41,7 @@ Source2:	%{name}-i.pamd
 Patch0:		%{name}-env.patch
 Patch1:		config.patch
 Patch2:		%{name}-sh.patch
+Patch3:		x32.patch
 URL:		http://www.sudo.ws/sudo/
 %{?with_audit:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf >= 2.53
@@ -195,6 +196,7 @@ cp -p acinclude.m4 acinclude.m4.orig
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 ! [ -f m4/ax_sys_weak_alias.m4 ] # provide own copy only until it is there
 cp %{_aclocaldir}/ax_sys_weak_alias.m4 m4
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..cc2b1fc
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,21 @@
+--- sudo-1.9.11p1/src/exec_ptrace.c~	2022-06-06 16:42:01.000000000 +0200
++++ sudo-1.9.11p1/src/exec_ptrace.c	2022-06-11 21:36:12.498210857 +0200
+@@ -1035,14 +1035,16 @@
+ 	switch (syscallno) {
+ # ifdef X32_execve
+ 	case X32_execve:
+-# endif
++# else
+ 	case __NR_execve:
++# endif
+ 	    /* Handled below. */
+ 	    break;
+ # ifdef X32_execveat
+ 	case X32_execveat:
+-# endif
++# else
+ 	case __NR_execveat:
++# endif
+ 	    /* We don't currently check execveat(2). */
+ 	    debug_return_bool(true);
+ 	    break;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sudo.git/commitdiff/adfc2546a5a0a7d74ee489f4720005fc49e9bc1f



More information about the pld-cvs-commit mailing list