gentoo resync : 10.11.2019

6 files changed, 100 insertions, 16 deletions

diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index b6fe5c4f411e..0552f5679b8e 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,9 @@
+AUX sudo-1.8.28-no_pam_error_message_fix.patch 1405 BLAKE2B 924c8be80bbbe75e1f3fbd9c598d91a02bd4a2c26efd8936c018d54f99977f0c64351f07a9fa5c6bffd52374accb143360da68c9a70eda0b16cf4019b419cb47 SHA512 9afcfc841635d5bcf67da292a205633fd7b4202d007dd3992e6e69ce98feb0cd5c8ebcd646ea8b46cdafad59779ae41dc3593b13ad35f9017e6c0c2cdc20ed2d
 DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac
 DIST sudo-1.8.28p1.tar.gz 3310254 BLAKE2B a1810af7a42d05cce49bb9d0acf6f3731a5193e9e9c3b458691379131eb86d36995854d11c09525e8d999ed1da7e99cf170634667c5a444aa522b8f23db7d1aa SHA512 bda3de34c15fbb68fc29759542295560ccc1562b419d03709cea51613937e9b92ba689c79c3ef4858aeea90d3d1a4dc0148225b11b22cf82395ae1bad8cb1734
 DIST sudo-1.8.29.tar.gz 3338260 BLAKE2B 7ba29d155bfb1d7ba20e32ade2e8ee3919e70400b6c235e313052b247b48406b9a051e71daa7e47fdb0a9fd0889f4c05b8a1a170c027503b90081e8cec81660e SHA512 ea780922b2afb47df4df4b533fb355fd916cb18a6bfd13c7ca36a25b03ef585d805648c6fa85692bea363b1f83664ac3bc622f99bcd149b3a86f70522eb4d340
-EBUILD sudo-1.8.27-r1.ebuild 6641 BLAKE2B 87663af3782d324385698c58407b6a74858bc60f8e174edf25789eda5f46039dfe811656f96371833dfaef5bad5a51804fae4cb98fb7b17fd64e09aeea0040de SHA512 cdc83a9b9578c23e3dfd30898555e2276332ff947b8695d6a322fd75a564f2be5ad8d62164d88e055a832ed15884e4dac999d93afbd90f683648ad96f0603990
-EBUILD sudo-1.8.28_p1.ebuild 6666 BLAKE2B 551d3373f646240fe899cac890cbe926e77efdc83f041ce4198c47d8305ba7ee008a8434105218a578d178621128181922b98fd43efa60f9ae43057af14d82e7 SHA512 3acc292c0527f15cbfc37bc056d420bfe3c14a247920fd02f1bc8e7a44cbe037faa6580d8da9a8a4a3c3c496e498463d13d190c7fc77a843c0258a206294bf1e
-EBUILD sudo-1.8.29.ebuild 6677 BLAKE2B 5a5ec21a1dcbd3807957781a86cf1629c8050bf49169c84cbecc1c3540a053ad5049cafa015c7a9fe96e761c812c0e5309f6e537eade26cedbb5379ecf526d41 SHA512 266f6117189dfd4d25cfbe2af2b69f6fc1523c12dd0c2d4d3431f96fb690f9f911c62baf8986b0cfcbebdae3a7ed70a1dd966c8232d98120731eae013ed0f03e
-EBUILD sudo-9999.ebuild 6677 BLAKE2B 5a5ec21a1dcbd3807957781a86cf1629c8050bf49169c84cbecc1c3540a053ad5049cafa015c7a9fe96e761c812c0e5309f6e537eade26cedbb5379ecf526d41 SHA512 266f6117189dfd4d25cfbe2af2b69f6fc1523c12dd0c2d4d3431f96fb690f9f911c62baf8986b0cfcbebdae3a7ed70a1dd966c8232d98120731eae013ed0f03e
+EBUILD sudo-1.8.27-r1.ebuild 6605 BLAKE2B a27d6c43fbc7db19d41e566c5f7ea6d1d1a206b78f899f45218897f1823463b85cb3e85dac0ac37f667ec4f6cf22c6d8114635a4d430fab4a2d0e18e58039e6e SHA512 ff13c6e8825d0554977a13a331f7156c1d886202de4646de1385a1d85d69a84ed17c672836dc7993ed768a375bbc798d68032f7ab975396cfff614b3d0f8b73f
+EBUILD sudo-1.8.28_p1-r2.ebuild 6944 BLAKE2B 38f05416e25847f8adf2ddb24535e9f169c1a8813ccd3fd46364082d03c4f83d594ec3b40ac7a11ab23fab3213ff1485a7046eb762ce89a58c8f7ae4861e1b14 SHA512 51586f8eefdbaee8436702279f9e548c1d13e1104bab08a038283e0155b513e1e98b081208d8bd40afe0f0d68485474f7027462e95edbbaf3b96fa4e625f355d
+EBUILD sudo-1.8.29-r2.ebuild 6956 BLAKE2B 4065346eafcaf93f22182bb168b5ed753e65a59f2d5469c48883d19c962bd4754cff648d10bdd404d0ba846f74944670c194ad5740edcaafb605a596d214f664 SHA512 c034ce70c59e5d1bd51b1f9514aa410e372ad987776ec4447b368448770a677b548fd8aec27477f2e0c64ba050617714489f7406977e4cb762b9a14c815affb6
+EBUILD sudo-9999.ebuild 6876 BLAKE2B 3fa9af915033ac10e6cf54880b64df0dadf7fa30ccf85d34fafa1c9fbc57cc187f7820086f242d90733583c79e82a50f336b9bdb9b21b98e72b2c377f6e550af SHA512 5efb6786e9d56e0b6b6f48fd4d25b24327772ce2b2ee0af366d73d67387f959159a83b66c2421e6a919b088d8143e3396f64423200bdfbb28a38e69043de0c7c
 MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
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
new file mode 100644
index 000000000000..6931ea26c3b5
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.8.28-no_pam_error_message_fix.patch
@@ -0,0 +1,46 @@
+
+# HG changeset patch
+# User Todd C. Miller <Todd.Miller@sudo.ws>
+# Date 1573059314 25200
+# Node ID f85ff5ee2caf19cefca67ae49c1d6048d61125cb
+# Parent  5cdcfd9a6c33a157a12f1b1893e397c3198b206b
+Do not warn about a missing /etc/environment file on Linux without PAM.
+Bug #907
+
+diff -r 5cdcfd9a6c33 -r f85ff5ee2caf plugins/sudoers/env.c
+--- a/plugins/sudoers/env.c	Tue Nov 05 15:18:34 2019 -0700
++++ b/plugins/sudoers/env.c	Wed Nov 06 09:55:14 2019 -0700
+@@ -940,7 +940,8 @@
+ #endif /* HAVE_LOGIN_CAP_H */
+ #if defined(_AIX) || (defined(__linux__) && !defined(HAVE_PAM))
+ 	    /* Insert system-wide environment variables. */
+-	    read_env_file(_PATH_ENVIRONMENT, true, false);
++	    if (!read_env_file(_PATH_ENVIRONMENT, true, false))
++		sudo_warn("%s", _PATH_ENVIRONMENT);
+ #endif
+ 	    for (ep = env.envp; *ep; ep++)
+ 		env_update_didvar(*ep, &didvar);
+@@ -1218,8 +1219,10 @@
+     efl = calloc(1, sizeof(*efl));
+     if (efl != NULL) {
+ 	if ((efl->fp = fopen(path, "r")) == NULL) {
+-	    free(efl);
+-	    efl = NULL;
++	    if (errno != ENOENT) {
++		free(efl);
++		efl = NULL;
++	    }
+ 	}
+     }
+     debug_return_ptr(efl);
+@@ -1259,6 +1262,9 @@
+     debug_decl(env_file_next_local, SUDOERS_DEBUG_ENV)
+ 
+     *errnum = 0;
++    if (efl->fp == NULL)
++	debug_return_ptr(NULL);
++
+     for (;;) {
+ 	if (sudo_parseln(&efl->line, &efl->linesize, NULL, efl->fp, PARSELN_CONT_IGN) == -1) {
+ 	    if (!feof(efl->fp))
+
diff --git a/app-admin/sudo/sudo-1.8.27-r1.ebuild b/app-admin/sudo/sudo-1.8.27-r1.ebuild
index bc2da1f33189..238ac099e8d0 100644
--- a/app-admin/sudo/sudo-1.8.27-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.27-r1.ebuild
@@ -142,8 +142,7 @@ src_configure() {
 		--with-env-editor
 		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
 		--with-rundir="${EPREFIX}"/run/sudo
-		$(use_with secure-path secure-path ${SECURE_PATH})
-		--with-secure-path="${SECURE_PATH}"
+		$(use_with secure-path secure-path "${SECURE_PATH}")
 		--with-vardir="${EPREFIX}"/var/db/sudo
 		--without-linux-audit
 		--without-opie
diff --git a/app-admin/sudo/sudo-1.8.28_p1.ebuild b/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild
index d22f403b4434..944044c91291 100644
--- a/app-admin/sudo/sudo-1.8.28_p1.ebuild
+++ b/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-solaris"
+		KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-solaris"
 	fi
 fi
 
@@ -36,7 +36,10 @@ DEPEND="
 	sys-libs/zlib:=
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
-		dev-libs/cyrus-sasl
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap[sasl]
+		)
 	)
 	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
@@ -72,6 +75,10 @@ REQUIRED_USE="
 
 MAKEOPTS+=" SAMPLES="
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.28-no_pam_error_message_fix.patch" #698946
+)
+
 src_prepare() {
 	default
 	elibtoolize
@@ -140,8 +147,7 @@ src_configure() {
 		--with-env-editor
 		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
 		--with-rundir="${EPREFIX}"/run/sudo
-		$(use_with secure-path secure-path ${SECURE_PATH})
-		--with-secure-path="${SECURE_PATH}"
+		$(use_with secure-path secure-path "${SECURE_PATH}")
 		--with-vardir="${EPREFIX}"/var/db/sudo
 		--without-linux-audit
 		--without-opie
@@ -183,6 +189,14 @@ src_install() {
 		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
 		EOF
 
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
 		insinto /etc
 		doins "${T}"/ldap.conf.sudo
 		fperms 0440 /etc/ldap.conf.sudo
diff --git a/app-admin/sudo/sudo-1.8.29.ebuild b/app-admin/sudo/sudo-1.8.29-r2.ebuild
index d53e24703c68..50585e30f912 100644
--- a/app-admin/sudo/sudo-1.8.29.ebuild
+++ b/app-admin/sudo/sudo-1.8.29-r2.ebuild
@@ -36,7 +36,10 @@ DEPEND="
 	sys-libs/zlib:=
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
-		dev-libs/cyrus-sasl
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap[sasl]
+		)
 	)
 	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
@@ -72,6 +75,10 @@ REQUIRED_USE="
 
 MAKEOPTS+=" SAMPLES="
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.28-no_pam_error_message_fix.patch" #698946
+)
+
 src_prepare() {
 	default
 	elibtoolize
@@ -140,8 +147,7 @@ src_configure() {
 		--with-env-editor
 		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
 		--with-rundir="${EPREFIX}"/run/sudo
-		$(use_with secure-path secure-path ${SECURE_PATH})
-		--with-secure-path="${SECURE_PATH}"
+		$(use_with secure-path secure-path "${SECURE_PATH}")
 		--with-vardir="${EPREFIX}"/var/db/sudo
 		--without-linux-audit
 		--without-opie
@@ -183,6 +189,14 @@ src_install() {
 		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
 		EOF
 
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
 		insinto /etc
 		doins "${T}"/ldap.conf.sudo
 		fperms 0440 /etc/ldap.conf.sudo
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index d53e24703c68..fc4f44f8e4fc 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -36,7 +36,10 @@ DEPEND="
 	sys-libs/zlib:=
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
-		dev-libs/cyrus-sasl
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap[sasl]
+		)
 	)
 	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
@@ -140,8 +143,7 @@ src_configure() {
 		--with-env-editor
 		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
 		--with-rundir="${EPREFIX}"/run/sudo
-		$(use_with secure-path secure-path ${SECURE_PATH})
-		--with-secure-path="${SECURE_PATH}"
+		$(use_with secure-path secure-path "${SECURE_PATH}")
 		--with-vardir="${EPREFIX}"/var/db/sudo
 		--without-linux-audit
 		--without-opie
@@ -183,6 +185,14 @@ src_install() {
 		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
 		EOF
 
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
 		insinto /etc
 		doins "${T}"/ldap.conf.sudo
 		fperms 0440 /etc/ldap.conf.sudo