diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-07 23:19:36 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-07 23:19:36 +0000 |
commit | 3a1af8e54315281278bfee9389db2c7568fcecff (patch) | |
tree | a0dc50435ed5d0425f81ad891502462cfcdd4d3a /app-admin | |
parent | amd64/x86 stable, bug #295481 (diff) | |
download | historical-3a1af8e54315281278bfee9389db2c7568fcecff.tar.gz historical-3a1af8e54315281278bfee9389db2c7568fcecff.tar.bz2 historical-3a1af8e54315281278bfee9389db2c7568fcecff.zip |
Use -r1 and -r2 so that we can eventually stable this.
Package-Manager: portage-2.2_rc56/cvs/Linux x86_64
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/sudo/ChangeLog | 9 | ||||
-rw-r--r-- | app-admin/sudo/Manifest | 11 | ||||
-rw-r--r-- | app-admin/sudo/sudo-1.7.2_p2-r1.ebuild | 210 | ||||
-rw-r--r-- | app-admin/sudo/sudo-1.7.2_p2-r2.ebuild (renamed from app-admin/sudo/sudo-1.7.2_p2.ebuild) | 2 |
4 files changed, 225 insertions, 7 deletions
diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog index f73be7cae438..0fd0b9ba32fa 100644 --- a/app-admin/sudo/ChangeLog +++ b/app-admin/sudo/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/sudo # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.200 2009/12/07 22:22:49 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.201 2009/12/07 23:19:36 flameeyes Exp $ + +*sudo-1.7.2_p2-r2 (07 Dec 2009) +*sudo-1.7.2_p2-r1 (07 Dec 2009) + + 07 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> + -sudo-1.7.2_p2.ebuild, +sudo-1.7.2_p2-r1.ebuild, +sudo-1.7.2_p2-r2.ebuild: + Use -r1 and -r2 so that we can eventually stable this. *sudo-1.7.2_p2 (07 Dec 2009) diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index 66252c0425e3..0a55524c634c 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -7,13 +7,14 @@ AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef083315 DIST sudo-1.7.2p1.tar.gz 771059 RMD160 5f345d6062f178700fd78c93c04ee47c03bbcc50 SHA1 2ef461d840110d2c9160db142336591775ede67a SHA256 34d11a1dd8bace0885f55b4c8bddda1da29993ff8d7174099e25bd80db1eaf7f DIST sudo-1.7.2p2.tar.gz 772399 RMD160 4ab92524639b5d6822c48d0f74f80dc1c674ab0e SHA1 b729c158f81f5cff4ce6193f3db7bee00a2c2fbe SHA256 3d93aa2d52873b1fc82dc6dd64f1046e4636735f55d9ca7861ef02235b7c7e45 EBUILD sudo-1.7.2_p1.ebuild 6513 RMD160 4973cb8bdb47e40693a48e7ce8e54610f0318a6b SHA1 e356dcbd1c0fea524dd8352001ea2b8ee8ba9471 SHA256 7d9c19e60ca675f26df6d92691db8f28d85e89285367ff7020e2f2e0d0db3183 -EBUILD sudo-1.7.2_p2.ebuild 6355 RMD160 85cc8acc902bb37d26ca124324e633242d1c89a9 SHA1 d16ff2d73397ffeb393453934ee504d18eac5b90 SHA256 74c1798ec7e99e7adbb9de7bd1c60d80391d7751e0f1025ddb09ca2567404688 -MISC ChangeLog 27855 RMD160 b3c9217b2106be0285c9902896f3b031cc98aa2c SHA1 615478810ae15619e092b9182ef183f856820b42 SHA256 561a9759f235f89b52ec84e9b5ffa9c9b761d887c52269b4020383d8ba0b4a24 +EBUILD sudo-1.7.2_p2-r1.ebuild 6459 RMD160 c2bb35cad09bec61ae4edfd41349b8f8e8a6c113 SHA1 15e6f298104f7b3b432b153183c7b9fb8e303a92 SHA256 08d1088270ce4b29017cb0229204bdb3128e71581b68afd720a3137cb5125cfb +EBUILD sudo-1.7.2_p2-r2.ebuild 6358 RMD160 4a4b96cfad0abc4cb5c4fab1c6bbf11998c6e415 SHA1 59c3855c7dfdb3f9ebfa0fddf548d013ba06812f SHA256 028f336b840822e01d5e28b201bdf05f83423635b3cd2dfca44c1d051dfedfa6 +MISC ChangeLog 28111 RMD160 386ddc038356c7da15d167174962feee68ae8e8b SHA1 b46dca2bb3951eb266eac3fb0a2df23bf59ee14a SHA256 13a62c992e9d9b881527319449a3e77e722cc0abe83d426c7c259578c1a878c2 MISC metadata.xml 434 RMD160 a713e5ffdcc2216a46f5023ab77c6e3aeed0d183 SHA1 49a31df517e1ec39344ac83c13e9fca87379d261 SHA256 87e2d9f4535e80f4ba1f73366040bb23cfb4b1f3101c0e33df73aff2e77fc13f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAksdgA4ACgkQAiZjviIA2XhsUwCeOQZME1JXTdM0rqWas5rUcM/s -ZS8An36unzgwEJQD7uuk/KZ8bY822xGa -=qKF2 +iEYEARECAAYFAksdjV4ACgkQAiZjviIA2XhlnwCgorxa/B8ubFWC3iF6KlKvqkzG +vgoAoLqjBPmgtFlq8PjQ+IksP5yd9YQh +=M0ls -----END PGP SIGNATURE----- diff --git a/app-admin/sudo/sudo-1.7.2_p2-r1.ebuild b/app-admin/sudo/sudo-1.7.2_p2-r1.ebuild new file mode 100644 index 000000000000..2d5dd520042e --- /dev/null +++ b/app-admin/sudo/sudo-1.7.2_p2-r1.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.2_p2-r1.ebuild,v 1.1 2009/12/07 23:19:36 flameeyes Exp $ + +inherit eutils pam confutils + +MY_P=${P/_/} +MY_P=${MY_P/beta/b} + +case "${P}" in + *_beta* | *_rc*) + uri_prefix=beta/ + ;; + *) + uri_prefix="" + ;; +esac + +DESCRIPTION="Allows users or groups to run commands as other users" +HOMEPAGE="http://www.sudo.ws/" +SRC_URI="ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz" +# Basic license is ISC-style as-is, some files are released under +# 3-clause BSD license +LICENSE="as-is BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="pam skey offensive ldap selinux" + +DEPEND="pam? ( virtual/pam ) + ldap? ( + >=net-nds/openldap-2.1.30-r1 + dev-libs/cyrus-sasl + ) + skey? ( >=sys-auth/skey-1.1.5-r1 ) + virtual/editor + virtual/mta" +RDEPEND="selinux? ( sec-policy/selinux-sudo ) + ldap? ( dev-lang/perl ) + pam? ( sys-auth/pambase ) + ${DEPEND}" +DEPEND="${DEPEND} sys-devel/bison" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + confutils_use_conflict skey pam +} + +src_unpack() { + unpack ${A}; cd "${S}" + + # compatability fix. + epatch "${FILESDIR}"/${PN}-skeychallengeargs.diff + + # additional variables to disallow, should user disable env_reset. + + # NOTE: this is not a supported mode of operation, these variables + # are added to the blacklist as a convenience to administrators + # who fail to heed the warnings of allowing untrusted users + # to access sudo. + # + # there is *no possible way* to foresee all attack vectors in + # all possible applications that could potentially be used via + # sudo, these settings will just delay the inevitable. + # + # that said, I will accept suggestions for variables that can + # be misused in _common_ interpreters or libraries, such as + # perl, bash, python, ruby, etc., in the hope of dissuading + # a casual attacker. + + # XXX: perl should be using suid_perl. + # XXX: users can remove/add more via env_delete and env_check. + # XXX: <?> = probably safe enough for most circumstances. + + einfo "Blacklisting common variables (env_delete)..." + sudo_bad_var() { + local target='env.c' marker='\*initial_badenv_table\[\]' + + ebegin " $1" + sed -i 's#\(^.*'${marker}'.*$\)#\1\n\t"'${1}'",#' "${S}"/${target} + eend $? + } + + sudo_bad_var 'PERLIO_DEBUG' # perl, write debug to file. + sudo_bad_var 'FPATH' # ksh, search path for functions. + sudo_bad_var 'NULLCMD' # zsh, command on null-redir. <?> + sudo_bad_var 'READNULLCMD' # zsh, command on null-redir. <?> + sudo_bad_var 'GLOBIGNORE' # bash, glob paterns to ignore. <?> + sudo_bad_var 'PYTHONHOME' # python, module search path. + sudo_bad_var 'PYTHONPATH' # python, search path. + sudo_bad_var 'PYTHONINSPECT' # python, allow inspection. + sudo_bad_var 'RUBYLIB' # ruby, lib load path. + sudo_bad_var 'RUBYOPT' # ruby, cl options. + sudo_bad_var 'ZDOTDIR' # zsh, path to search for dotfiles. + einfo "...done." + + # prevent binaries from being stripped. + sed -i 's/\($(INSTALL).*\) -s \(.*[(sudo|visudo)]\)/\1 \2/g' Makefile.in +} + +src_compile() { + local line ROOTPATH + + # FIXME: secure_path is a compile time setting. using ROOTPATH + # is not perfect, env-update may invalidate this, but until it + # is available as a sudoers setting this will have to do. + einfo "Setting secure_path..." + + # why not use grep? variable might be expanded from other variables + # declared in that file. cannot just source the file, would override + # any variables already set. + eval `PS4= bash -x /etc/profile.env 2>&1 | \ + while read line; do + case $line in + ROOTPATH=*) echo $line; break;; + *) continue;; + esac + done` && einfo " Found ROOTPATH..." || \ + ewarn " Failed to find ROOTPATH, please report this." + + # remove duplicate path entries from $1 + cleanpath() { + local i=1 x n IFS=: + local -a paths; paths=($1) + + for ((n=${#paths[*]}-1;i<=n;i++)); do + for ((x=0;x<i;x++)); do + test "${paths[i]}" == "${paths[x]}" && { + einfo " Duplicate entry ${paths[i]} removed..." 1>&2 + unset paths[i]; continue 2; } + done; # einfo " Adding ${paths[i]}..." 1>&2 + done; echo "${paths[*]}" + } + + ROOTPATH=$(cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}) + + # strip gcc path (bug #136027) + rmpath() { + declare e newpath oldpath=${!1} PATHvar=$1 thisp IFS=: + shift + for thisp in $oldpath; do + for e; do [[ $thisp == $e ]] && continue 2; done + newpath=$newpath:$thisp + done + eval $PATHvar='${newpath#:}' + } + + rmpath ROOTPATH '*/gcc-bin/*' + + einfo "...done." + + # XXX: --disable-path-info closes an info leak, but may be confusing. + # XXX: /bin/vi may not be available, make nano visudo's default. + econf --with-secure-path="${ROOTPATH}" \ + --with-editor="${EDITOR:-/bin/nano}" \ + --with-env-editor \ + $(use_with offensive insults) \ + $(use_with offensive all-insults) \ + $(use_with pam) \ + $(use_with skey) \ + $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \ + $(use_with ldap) || die + + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc ChangeLog HISTORY PORTING README TROUBLESHOOTING \ + UPGRADE WHATSNEW sample.sudoers sample.syslog.conf + + if use ldap; then + dodoc README.LDAP schema.OpenLDAP + dosbin sudoers2ldif + + cat - > "${T}"/ldap.conf.sudo <<EOF +# See ldap.conf(5) and README.LDAP for details\n" +# This file should only be readable by root\n\n" +# supported directives: host, port, ssl, ldap_version\n" +# uri, binddn, bindpw, sudoers_base, sudoers_debug\n" +# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key +EOF + + insinto /etc + doins "${T}"/ldap.conf.sudo + fperms 0440 /etc/ldap.conf.sudo + fi + + pamd_mimic system-auth sudo auth account password session + + insinto /etc + doins "${S}"/sudoers + fperms 0440 /etc/sudoers +} + +pkg_postinst() { + if use ldap; then + ewarn + ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration." + ewarn + if egrep -q '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf; then + ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly" + ewarn "configured in /etc/nsswitch.conf." + ewarn + ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:" + ewarn " sudoers: ldap files" + ewarn + fi + fi +} diff --git a/app-admin/sudo/sudo-1.7.2_p2.ebuild b/app-admin/sudo/sudo-1.7.2_p2-r2.ebuild index 3248a44e99ae..7ae1a3f9e499 100644 --- a/app-admin/sudo/sudo-1.7.2_p2.ebuild +++ b/app-admin/sudo/sudo-1.7.2_p2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.2_p2.ebuild,v 1.1 2009/12/07 22:22:49 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.2_p2-r2.ebuild,v 1.1 2009/12/07 23:19:36 flameeyes Exp $ inherit eutils pam confutils |