| 1 |
commit: c11c2b56f0938b3f3c0d46c8b17af61bae075174 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 7 09:52:58 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 7 09:54:22 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11c2b56 |
| 7 |
|
| 8 |
app-admin/sudo: Revbumps to fix error message with USE="-pam" |
| 9 |
|
| 10 |
Reported-by: Saul Peebsen <jaglover <AT> gmail.com> |
| 11 |
Tested-by: Saul Peebsen <jaglover <AT> gmail.com> |
| 12 |
Closes: https://bugs.gentoo.org/698946 |
| 13 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 15 |
|
| 16 |
.../sudo-1.8.28-no_pam_error_message_fix.patch | 46 ++++++++++++++++++++++ |
| 17 |
....8.28_p1-r1.ebuild => sudo-1.8.28_p1-r2.ebuild} | 4 ++ |
| 18 |
...sudo-1.8.29-r1.ebuild => sudo-1.8.29-r2.ebuild} | 4 ++ |
| 19 |
3 files changed, 54 insertions(+) |
| 20 |
|
| 21 |
diff --git a/app-admin/sudo/files/sudo-1.8.28-no_pam_error_message_fix.patch b/app-admin/sudo/files/sudo-1.8.28-no_pam_error_message_fix.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..6931ea26c3b |
| 24 |
--- /dev/null |
| 25 |
+++ b/app-admin/sudo/files/sudo-1.8.28-no_pam_error_message_fix.patch |
| 26 |
@@ -0,0 +1,46 @@ |
| 27 |
+ |
| 28 |
+# HG changeset patch |
| 29 |
+# User Todd C. Miller <Todd.Miller@××××.ws> |
| 30 |
+# Date 1573059314 25200 |
| 31 |
+# Node ID f85ff5ee2caf19cefca67ae49c1d6048d61125cb |
| 32 |
+# Parent 5cdcfd9a6c33a157a12f1b1893e397c3198b206b |
| 33 |
+Do not warn about a missing /etc/environment file on Linux without PAM. |
| 34 |
+Bug #907 |
| 35 |
+ |
| 36 |
+diff -r 5cdcfd9a6c33 -r f85ff5ee2caf plugins/sudoers/env.c |
| 37 |
+--- a/plugins/sudoers/env.c Tue Nov 05 15:18:34 2019 -0700 |
| 38 |
++++ b/plugins/sudoers/env.c Wed Nov 06 09:55:14 2019 -0700 |
| 39 |
+@@ -940,7 +940,8 @@ |
| 40 |
+ #endif /* HAVE_LOGIN_CAP_H */ |
| 41 |
+ #if defined(_AIX) || (defined(__linux__) && !defined(HAVE_PAM)) |
| 42 |
+ /* Insert system-wide environment variables. */ |
| 43 |
+- read_env_file(_PATH_ENVIRONMENT, true, false); |
| 44 |
++ if (!read_env_file(_PATH_ENVIRONMENT, true, false)) |
| 45 |
++ sudo_warn("%s", _PATH_ENVIRONMENT); |
| 46 |
+ #endif |
| 47 |
+ for (ep = env.envp; *ep; ep++) |
| 48 |
+ env_update_didvar(*ep, &didvar); |
| 49 |
+@@ -1218,8 +1219,10 @@ |
| 50 |
+ efl = calloc(1, sizeof(*efl)); |
| 51 |
+ if (efl != NULL) { |
| 52 |
+ if ((efl->fp = fopen(path, "r")) == NULL) { |
| 53 |
+- free(efl); |
| 54 |
+- efl = NULL; |
| 55 |
++ if (errno != ENOENT) { |
| 56 |
++ free(efl); |
| 57 |
++ efl = NULL; |
| 58 |
++ } |
| 59 |
+ } |
| 60 |
+ } |
| 61 |
+ debug_return_ptr(efl); |
| 62 |
+@@ -1259,6 +1262,9 @@ |
| 63 |
+ debug_decl(env_file_next_local, SUDOERS_DEBUG_ENV) |
| 64 |
+ |
| 65 |
+ *errnum = 0; |
| 66 |
++ if (efl->fp == NULL) |
| 67 |
++ debug_return_ptr(NULL); |
| 68 |
++ |
| 69 |
+ for (;;) { |
| 70 |
+ if (sudo_parseln(&efl->line, &efl->linesize, NULL, efl->fp, PARSELN_CONT_IGN) == -1) { |
| 71 |
+ if (!feof(efl->fp)) |
| 72 |
+ |
| 73 |
|
| 74 |
diff --git a/app-admin/sudo/sudo-1.8.28_p1-r1.ebuild b/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild |
| 75 |
similarity index 98% |
| 76 |
rename from app-admin/sudo/sudo-1.8.28_p1-r1.ebuild |
| 77 |
rename to app-admin/sudo/sudo-1.8.28_p1-r2.ebuild |
| 78 |
index 06397f8cdcb..4c371226f1d 100644 |
| 79 |
--- a/app-admin/sudo/sudo-1.8.28_p1-r1.ebuild |
| 80 |
+++ b/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild |
| 81 |
@@ -75,6 +75,10 @@ REQUIRED_USE=" |
| 82 |
|
| 83 |
MAKEOPTS+=" SAMPLES=" |
| 84 |
|
| 85 |
+PATCHES=( |
| 86 |
+ "${FILESDIR}/${PN}-1.8.28-no_pam_error_message_fix.patch" #698946 |
| 87 |
+) |
| 88 |
+ |
| 89 |
src_prepare() { |
| 90 |
default |
| 91 |
elibtoolize |
| 92 |
|
| 93 |
diff --git a/app-admin/sudo/sudo-1.8.29-r1.ebuild b/app-admin/sudo/sudo-1.8.29-r2.ebuild |
| 94 |
similarity index 98% |
| 95 |
rename from app-admin/sudo/sudo-1.8.29-r1.ebuild |
| 96 |
rename to app-admin/sudo/sudo-1.8.29-r2.ebuild |
| 97 |
index 4aba6ef09a1..3f019d90fd0 100644 |
| 98 |
--- a/app-admin/sudo/sudo-1.8.29-r1.ebuild |
| 99 |
+++ b/app-admin/sudo/sudo-1.8.29-r2.ebuild |
| 100 |
@@ -75,6 +75,10 @@ REQUIRED_USE=" |
| 101 |
|
| 102 |
MAKEOPTS+=" SAMPLES=" |
| 103 |
|
| 104 |
+PATCHES=( |
| 105 |
+ "${FILESDIR}/${PN}-1.8.28-no_pam_error_message_fix.patch" #698946 |
| 106 |
+) |
| 107 |
+ |
| 108 |
src_prepare() { |
| 109 |
default |
| 110 |
elibtoolize |
Archives