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@