[arch-commits] Commit in sudo/trunk (PKGBUILD append_defaults-boolean-flags.patch)

[Evangelos Foutras]

    Date: Friday, September 17, 2021 @ 03:34:45
  Author: foutrelis
Revision: 424272

upgpkg: sudo 1.9.8.p1-1: new upstream release

Modified:
  sudo/trunk/PKGBUILD
Deleted:
  sudo/trunk/append_defaults-boolean-flags.patch

-------------------------------------+
 PKGBUILD                            |   10 ++-----
 append_defaults-boolean-flags.patch |   48 ----------------------------------
 2 files changed, 3 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-17 01:24:06 UTC (rev 424271)
+++ PKGBUILD	2021-09-17 03:34:45 UTC (rev 424272)
@@ -3,8 +3,8 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=sudo
-_sudover=1.9.8
-pkgrel=2
+_sudover=1.9.8p1
+pkgrel=1
 pkgver=${_sudover/p/.p}
 pkgdesc="Give certain users the ability to run some commands as root"
 arch=('x86_64')
@@ -18,12 +18,10 @@
         'etc/sudoers')
 install=$pkgname.install
 source=(https://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
-        append_defaults-boolean-flags.patch
         sudo_logsrvd.service
         sudo.pam)
-sha256sums=('f1735de999804ea1af068fba6a82cb6674ea64c789813b29266fd3b16cb294e6'
+sha256sums=('0939ee24df7095a92e0ca4aa3bd53b2a10965a7b921d51a26ab70cdd24388d69'
             'SKIP'
-            '36648e052a834275636bef75a00197e43cd1baaa07006cd3b426e99cc109b4b9'
             '8b91733b73171827c360a3e01f4692772b78e62ceca0cf0fd4b770aba35081a1'
             'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
 validpgpkeys=('59D1E9CCBA2B376704FDD35BA9F4C021CEA470FB')
@@ -30,8 +28,6 @@
 
 prepare() {
   cd "$srcdir/$pkgname-$_sudover"
-  # https://bugs.archlinux.org/task/72146
-  patch -Np1 -i ../append_defaults-boolean-flags.patch
 }
 
 build() {

Deleted: append_defaults-boolean-flags.patch
===================================================================
--- append_defaults-boolean-flags.patch	2021-09-17 01:24:06 UTC (rev 424271)
+++ append_defaults-boolean-flags.patch	2021-09-17 03:34:45 UTC (rev 424272)
@@ -1,48 +0,0 @@
-From d7cdf1e47c596c3fa6cffedd4904c67919389668 Mon Sep 17 00:00:00 2001
-From: "Todd C. Miller" <Todd.Miller at sudo.ws>
-Date: Tue, 14 Sep 2021 08:02:37 -0600
-Subject: [PATCH] append_defaults() should not be passed a value for boolean
- flags. The operation should simply be set to true/false. Also treat a NULL
- file as coming from the front-end. Bug #993.
-
----
- plugins/sudoers/defaults.c | 3 +++
- plugins/sudoers/policy.c   | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c
-index 5739b40e2..95e6fbd30 100644
---- a/plugins/sudoers/defaults.c
-+++ b/plugins/sudoers/defaults.c
-@@ -206,6 +206,9 @@ parse_default_entry(struct sudo_defs_types *def, const char *val, int op,
-     int rc;
-     debug_decl(parse_default_entry, SUDOERS_DEBUG_DEFAULTS);
- 
-+    if (file == NULL)
-+	file = "front-end";
-+
-     sudo_debug_printf(SUDO_DEBUG_INFO, "%s: %s:%d:%d: %s=%s op=%d",
- 	__func__, file, line, column, def->name, val ? val : "", op);
- 
-diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c
-index eb1ce43b7..c8c20735d 100644
---- a/plugins/sudoers/policy.c
-+++ b/plugins/sudoers/policy.c
-@@ -224,7 +224,7 @@ sudoers_policy_deserialize_info(void *v, struct defaults_list *defaults)
- 	if (MATCHES(*cur, "prompt=")) {
- 	    /* Allow epmpty prompt. */
- 	    user_prompt = *cur + sizeof("prompt=") - 1;
--	    if (!append_default("passprompt_override", "true", true, NULL, defaults))
-+	    if (!append_default("passprompt_override", NULL, true, NULL, defaults))
- 		goto oom;
- 	    continue;
- 	}
-@@ -285,7 +285,7 @@ sudoers_policy_deserialize_info(void *v, struct defaults_list *defaults)
- 	if (MATCHES(*cur, "login_class=")) {
- 	    CHECK(*cur, "login_class=");
- 	    login_class = *cur + sizeof("login_class=") - 1;
--	    if (!append_default("use_loginclass", "true", true, NULL, defaults))
-+	    if (!append_default("use_loginclass", NULL, true, NULL, defaults))
- 		goto oom;
- 	    continue;
- 	}