diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-05-17 19:07:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-17 19:07:29 +0000 |
| commit | 2dbba0df71d0533dc9059eb17122a137c1824431 (patch) | |
| tree | 60e6c4446ef7f6937925f91d291653a1cb0194ed /app-admin/sudo | |
| parent | factorize the libssp_nonshared bootstrapping code (diff) | |
| download | gentoo-2-2dbba0df71d0533dc9059eb17122a137c1824431.tar.gz gentoo-2-2dbba0df71d0533dc9059eb17122a137c1824431.tar.bz2 gentoo-2-2dbba0df71d0533dc9059eb17122a137c1824431.zip | |
Fix parsing of #includedir directives #416371 by Marcin Mirosław.
(Portage version: 2.2.0_alpha102/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'app-admin/sudo')
| -rw-r--r-- | app-admin/sudo/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/sudo/files/sudo-1.8.5-securedir.patch | 26 | ||||
| -rw-r--r-- | app-admin/sudo/sudo-1.8.5-r1.ebuild (renamed from app-admin/sudo/sudo-1.8.5.ebuild) | 3 |
3 files changed, 35 insertions, 2 deletions
diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog index d9a02bb6843f..2a00418b442c 100644 --- a/app-admin/sudo/ChangeLog +++ b/app-admin/sudo/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/sudo # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.312 2012/05/17 18:46:01 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.313 2012/05/17 19:07:29 vapier Exp $ + +*sudo-1.8.5-r1 (17 May 2012) + + 17 May 2012; Mike Frysinger <vapier@gentoo.org> + +files/sudo-1.8.5-securedir.patch, +sudo-1.8.5-r1.ebuild, -sudo-1.8.5.ebuild: + Fix parsing of #includedir directives #416371 by Marcin Mirosław. 17 May 2012; Tobias Klausmann <klausman@gentoo.org> sudo-1.8.5.ebuild: Stable on alpha, bug #416281 diff --git a/app-admin/sudo/files/sudo-1.8.5-securedir.patch b/app-admin/sudo/files/sudo-1.8.5-securedir.patch new file mode 100644 index 000000000000..5b92eb71f3fc --- /dev/null +++ b/app-admin/sudo/files/sudo-1.8.5-securedir.patch @@ -0,0 +1,26 @@ +the new includedir parsing forgets to check for the positive case + +https://bugs.gentoo.org/416371 + +--- a/plugins/sudoers/toke.c ++++ b/plugins/sudoers/toke.c +@@ -843,6 +843,8 @@ + (unsigned int) sudoers_gid); + } + debug_return_bool(false); ++ case SUDO_PATH_SECURE: ++ break; + default: + /* NOTREACHED */ + debug_return_bool(false); +--- a/plugins/sudoers/toke.l ++++ b/plugins/sudoers/toke.l +@@ -843,6 +843,8 @@ + (unsigned int) sudoers_gid); + } + debug_return_bool(false); ++ case SUDO_PATH_SECURE: ++ break; + default: + /* NOTREACHED */ + debug_return_bool(false); diff --git a/app-admin/sudo/sudo-1.8.5.ebuild b/app-admin/sudo/sudo-1.8.5-r1.ebuild index ed93dae91ea9..5c948a2ec31f 100644 --- a/app-admin/sudo/sudo-1.8.5.ebuild +++ b/app-admin/sudo/sudo-1.8.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.5.ebuild,v 1.4 2012/05/17 18:46:01 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.5-r1.ebuild,v 1.1 2012/05/17 19:07:29 vapier Exp $ EAPI="4" @@ -50,6 +50,7 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" MAKEOPTS+=" SAMPLES=" src_prepare() { + epatch "${FILESDIR}"/${P}-securedir.patch #416371 elibtoolize } |