From bfb4cce23ac9eff565d2bcd0fa57c6685326d5d9 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sun, 9 Aug 2026 13:00:37 +0300 Subject: [PATCH] sudo: drop 020-no-owner-change.patch for a make override The patch blanked INSTALL_OWNER in Makefile.in so the staged install does not chown to install_uid/install_gid, which fails when building as an unprivileged user. sudo already supports this: the top-level install rule recurses with "INSTALL_OWNER=$(INSTALL_OWNER)" into every sub-make, and sudo's own "package" target does "make install INSTALL_OWNER=" for exactly this fakeroot case. Pass INSTALL_OWNER= via MAKE_INSTALL_FLAGS instead of carrying a patch. Signed-off-by: Alexandru Ardelean --- admin/sudo/Makefile | 6 +++++- admin/sudo/patches/020-no-owner-change.patch | 11 ----------- 2 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 admin/sudo/patches/020-no-owner-change.patch diff --git a/admin/sudo/Makefile b/admin/sudo/Makefile index 07e9a8d69e..13a5eb106d 100644 --- a/admin/sudo/Makefile +++ b/admin/sudo/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sudo PKG_REALVERSION:=1.9.17p2 PKG_VERSION:=$(subst p,_p,$(PKG_REALVERSION)) -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_REALVERSION).tar.gz PKG_SOURCE_URL:=https://www.sudo.ws/dist @@ -29,6 +29,10 @@ PKG_BUILD_FLAGS:=no-mips16 include $(INCLUDE_DIR)/package.mk +# Skip the install-time chown, which fails during the unprivileged staged +# install; sudo propagates INSTALL_OWNER into every sub-make. +MAKE_INSTALL_FLAGS += INSTALL_OWNER= + define Package/sudo SECTION:=admin CATEGORY:=Administration diff --git a/admin/sudo/patches/020-no-owner-change.patch b/admin/sudo/patches/020-no-owner-change.patch deleted file mode 100644 index 1bd3006682..0000000000 --- a/admin/sudo/patches/020-no-owner-change.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -75,7 +75,7 @@ EGREP = @EGREP@ - SED = @SED@ - - INSTALL = $(SHELL) $(scriptdir)/install-sh -c --INSTALL_OWNER = -o $(install_uid) -g $(install_gid) -+INSTALL_OWNER = - - ECHO_N = @ECHO_N@ - ECHO_C = @ECHO_C@