[PR PATCH] sudo: fix patching step

[PR PATCH] sudo: fix patching step

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages sudo-fix-patch
https://github.com/void-linux/void-packages/pull/42567

sudo: fix patching step
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42567.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sudo-fix-patch-42567.patch --]
[-- Type: text/x-diff, Size: 1374 bytes --]

From 23c7bbca04ec4267e221c0656443898520a3d445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 3 Mar 2023 14:12:56 +0700
Subject: [PATCH] sudo: fix patching step

---
 srcpkgs/sudo/patches/install_perms.patch | 3 +--
 srcpkgs/sudo/template                    | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/sudo/patches/install_perms.patch b/srcpkgs/sudo/patches/install_perms.patch
index 74cc5723a705..2db2893544c1 100644
--- a/srcpkgs/sudo/patches/install_perms.patch
+++ b/srcpkgs/sudo/patches/install_perms.patch
@@ -1,12 +1,11 @@
 --- a/scripts/install-sh
 +++ b/scripts/install-sh
-@@ -163,6 +163,9 @@ while ${MORETODO} ; do
+@@ -163,6 +163,8 @@ while ${MORETODO} ; do
      esac
      ${MORETODO} && shift
  done
 +CHOWN=:
 +CHGRP=:
-+CHMOD=:
  
  ##  Making a directory?
  if ${DIRMODE} ; then
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index e10c5f3c9556..9482385e0508 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -27,12 +27,7 @@ post_configure() {
 	esac
 }
 
-pre_install() {
-	find ${wrksrc} -type f -name Makefile -exec sed -i 's,$(INSTALL_OWNER),,g' {} \;
-}
-
 post_install() {
-	chmod +s ${DESTDIR}/usr/bin/sudo
 	vinstall ${FILESDIR}/sudo.pam 644 etc/pam.d sudo
 	vlicense LICENSE.md
 	# remove unused stuff.

Re: [PR PATCH] [Merged]: sudo: fix patching step

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]

There's a merged pull request on the void-packages repository

sudo: fix patching step
https://github.com/void-linux/void-packages/pull/42567

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->