[packages/sudo] up to 1.9.11p2
atler
atler at pld-linux.org
Mon Jun 13 11:37:23 CEST 2022
commit ed6c09210b5418a6176c431fb8cc76632eabea4b
Author: Jan Palus <atler at pld-linux.org>
Date: Mon Jun 13 11:36:52 2022 +0200
up to 1.9.11p2
sudo.spec | 8 +++-----
x32.patch | 26 --------------------------
2 files changed, 3 insertions(+), 31 deletions(-)
---
diff --git a/sudo.spec b/sudo.spec
index d05d1b8..0ce3fc5 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -29,19 +29,18 @@ Summary(ru.UTF-8): Позволяет определенным пользова
Summary(uk.UTF-8): Дозволяє вказаним користувачам виконувати команди від імені root
Name: sudo
# please see docs/UPGRADE.md for important changes each time updating sudo
-Version: 1.9.11p1
-Release: 3
+Version: 1.9.11p2
+Release: 1
Epoch: 1
License: BSD
Group: Applications/System
Source0: https://www.sudo.ws/dist/%{name}-%{version}.tar.gz
-# Source0-md5: 8cd373aec6cde5e93a646d2950bf8df6
+# Source0-md5: 70fa9c8752b6d495725da45f4211d3a7
Source1: %{name}.pamd
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
@@ -197,7 +196,6 @@ 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
deleted file mode 100644
index 0c4394d..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dfee181d1579a24c679eff960c85bc659c56993f Mon Sep 17 00:00:00 2001
-From: "Todd C. Miller" <Todd.Miller at sudo.ws>
-Date: Sat, 11 Jun 2022 16:59:18 -0600
-Subject: [PATCH] Fix compilation on Linux/x32; GitHub issue #158
-
----
- src/exec_ptrace.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/exec_ptrace.h b/src/exec_ptrace.h
-index 4a5a86581..4340a48ea 100644
---- a/src/exec_ptrace.h
-+++ b/src/exec_ptrace.h
-@@ -64,8 +64,10 @@
- */
- #if defined(__x86_64__)
- # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64
--# define X32_execve __X32_SYSCALL_BIT + 520
--# define X32_execveat __X32_SYSCALL_BIT + 545
-+# ifndef __ILP32__
-+# define X32_execve __X32_SYSCALL_BIT + 520
-+# define X32_execveat __X32_SYSCALL_BIT + 545
-+# endif
- # define sudo_pt_regs struct user_regs_struct
- # define reg_syscall(x) (x).orig_rax
- # define reg_retval(x) (x).rax
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sudo.git/commitdiff/ed6c09210b5418a6176c431fb8cc76632eabea4b
More information about the pld-cvs-commit
mailing list