diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-05-18 00:39:52 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-18 00:39:52 +0000 |
| commit | e6365c0dce70c451f48f329262877aec93fd1a68 (patch) | |
| tree | a2d25177a662a5f160218bd7e140ed67370efc4b /app-admin | |
| parent | Move libpostproc RDEPEND from virtual/ffmpeg to here as PDEPEND to resolve ci... (diff) | |
| download | gentoo-2-e6365c0dce70c451f48f329262877aec93fd1a68.tar.gz gentoo-2-e6365c0dce70c451f48f329262877aec93fd1a68.tar.bz2 gentoo-2-e6365c0dce70c451f48f329262877aec93fd1a68.zip | |
Version bump -- its the same as 1.8.5-r1, but with the patch integrated upstream.
(Portage version: 2.2.0_alpha102/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/sudo/ChangeLog | 9 | ||||
| -rw-r--r-- | app-admin/sudo/files/sudo-1.8.5-securedir.patch | 26 | ||||
| -rw-r--r-- | app-admin/sudo/sudo-1.8.5_p1.ebuild (renamed from app-admin/sudo/sudo-1.8.5-r1.ebuild) | 3 |
3 files changed, 9 insertions, 29 deletions
diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog index 2a00418b442c..61f536b6a127 100644 --- a/app-admin/sudo/ChangeLog +++ b/app-admin/sudo/ChangeLog @@ -1,6 +1,13 @@ # 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.313 2012/05/17 19:07:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.314 2012/05/18 00:39:51 vapier Exp $ + +*sudo-1.8.5_p1 (18 May 2012) + + 18 May 2012; Mike Frysinger <vapier@gentoo.org> -sudo-1.8.5-r1.ebuild, + +sudo-1.8.5_p1.ebuild, -files/sudo-1.8.5-securedir.patch: + Version bump -- its the same as 1.8.5-r1, but with the patch integrated + upstream. *sudo-1.8.5-r1 (17 May 2012) diff --git a/app-admin/sudo/files/sudo-1.8.5-securedir.patch b/app-admin/sudo/files/sudo-1.8.5-securedir.patch deleted file mode 100644 index 5b92eb71f3fc..000000000000 --- a/app-admin/sudo/files/sudo-1.8.5-securedir.patch +++ /dev/null @@ -1,26 +0,0 @@ -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-r1.ebuild b/app-admin/sudo/sudo-1.8.5_p1.ebuild index 5c948a2ec31f..17e5603f85af 100644 --- a/app-admin/sudo/sudo-1.8.5-r1.ebuild +++ b/app-admin/sudo/sudo-1.8.5_p1.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-r1.ebuild,v 1.1 2012/05/17 19:07:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.5_p1.ebuild,v 1.1 2012/05/18 00:39:51 vapier Exp $ EAPI="4" @@ -50,7 +50,6 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" MAKEOPTS+=" SAMPLES=" src_prepare() { - epatch "${FILESDIR}"/${P}-securedir.patch #416371 elibtoolize } |