From 6e8675b200b3d9456e9bcfc53bf98e7c5e30bdfd Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Thu, 19 Aug 2010 12:03:59 +0000 Subject: Version bump. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- app-admin/sudo/ChangeLog | 8 +- app-admin/sudo/Manifest | 12 +- app-admin/sudo/sudo-1.7.4_p2.ebuild | 240 ------------------------------------ app-admin/sudo/sudo-1.7.4_p3.ebuild | 240 ++++++++++++++++++++++++++++++++++++ 4 files changed, 253 insertions(+), 247 deletions(-) delete mode 100644 app-admin/sudo/sudo-1.7.4_p2.ebuild create mode 100644 app-admin/sudo/sudo-1.7.4_p3.ebuild (limited to 'app-admin/sudo') diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog index 5517db44fb25..60b7a0ab3dcf 100644 --- a/app-admin/sudo/ChangeLog +++ b/app-admin/sudo/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/sudo # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.238 2010/08/09 13:48:05 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.239 2010/08/19 12:03:59 flameeyes Exp $ + +*sudo-1.7.4_p3 (19 Aug 2010) + + 19 Aug 2010; Diego E. Pettenò + -sudo-1.7.4_p2.ebuild, +sudo-1.7.4_p3.ebuild: + Version bump. *sudo-1.7.4_p2 (09 Aug 2010) diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index 13b4dfa1d0a5..0a69aecee598 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -4,16 +4,16 @@ Hash: SHA1 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d DIST sudo-1.7.2p7.tar.gz 772356 RMD160 7ed1976bbce6d66939b85ce08a97c089dbeb1ec4 SHA1 0504e0d7b1d3c987e48325ec4caa6ebfe5237ff5 SHA256 07a9c83e628a088314523e558236ac3c4cb0d54d7d7093e5b3e4c8101b1a2bea DIST sudo-1.7.3.tar.gz 896160 RMD160 133011c6318268bd61a85a1a48fa94a7bbfd92cd SHA1 7d237f843acbc6b7f3b587b52ccbeb6e824d2375 SHA256 d1aeb6bb8770c4239cfb33ff6e5e6b7c3c026f245b546f2eda147da2f742d0ba -DIST sudo-1.7.4p2.tar.gz 962214 RMD160 38f8be910b8d80e396c2124bacef4b80283eac51 SHA1 575b4678fc284df73a269d74b5d3f616eb71680e SHA256 5e53839abd6bf8d23197cf2c4e54e14ebfd996e8b95ce0c6cb35cadacc1181e5 +DIST sudo-1.7.4p3.tar.gz 962697 RMD160 0583313d214fbc7946c1e36f100334e018c206b5 SHA1 e47de4d8cc22077085eb01eef38a65f74577d334 SHA256 1dd7ce66046c6479603db41c7cb9d878e1b4b1f23b90c9c7f2e5e808e3d0bbb5 EBUILD sudo-1.7.2_p7.ebuild 6873 RMD160 65f3b568b6cd9ffcb6416aa49fb077fe89b225ef SHA1 a462e80abcfd833862f491d06a9270869a77b003 SHA256 b217c506a2cd211f3da4dc325d31af247c1b8f76a2332f44a08d48c4791a8a57 EBUILD sudo-1.7.3.ebuild 6995 RMD160 d5b70d4544c82edd3fbc9638a0473421f769c546 SHA1 1f4c670c656df338914b1344bf20b02961dde6ba SHA256 5fb36e633016eb2a9f028da5aa2f5704d2a59097a58d530e298438fa41455363 -EBUILD sudo-1.7.4_p2.ebuild 7222 RMD160 25f131cbf32b6e4fa47a5eea30f95deab361189e SHA1 ed872b049cd1d0771e1ad4a118b95565c18c8a4e SHA256 e8d1b3d8c2aeae040deca237dde78fd7288f8541e0b8a980f2dffb0afdae3635 -MISC ChangeLog 33528 RMD160 140444d6a5122479241cfdf10ee57258a9964868 SHA1 18c1bfd74878ab3932af99d5b91ec369f0f0faf5 SHA256 59323e0173fddc02301208fc41544de9d3f4f492af2b65123453fe0846adc66f +EBUILD sudo-1.7.4_p3.ebuild 7222 RMD160 80a15323d3bef11a8aa518d4a83fa5e03792ccf6 SHA1 116f176ffe85f51f3f84e3cb840e7c7826de0721 SHA256 294dedcf84f81f514afad22f7bff6c82aaf224c93c55139520bdeef1085ec4bf +MISC ChangeLog 33679 RMD160 11192504e9901c16cf1b1e02333fe0c182872cb7 SHA1 7c6b137cc67d6488ac4d6ce9de3baaacc783d530 SHA256 8be2f1eea5cb3f5f89f4b7d13a1ad3753c3e7ec431ebc26a5ad5229e9aca4a5a MISC metadata.xml 434 RMD160 a713e5ffdcc2216a46f5023ab77c6e3aeed0d183 SHA1 49a31df517e1ec39344ac83c13e9fca87379d261 SHA256 87e2d9f4535e80f4ba1f73366040bb23cfb4b1f3101c0e33df73aff2e77fc13f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkxgBxUACgkQAiZjviIA2Xi9QQCeIgcnuS4Rl7ucygbCLnZXbDUl -1OUAoLU/WPYooLRVpc57qENCBjn6kb0b -=ENt7 +iEYEARECAAYFAkxtHbcACgkQAiZjviIA2XiMRQCfSIDl8r2kbHcjoS+P7guX3zGp +VkEAn0hDXkpvkNNtpNAuOxxqiXAjrw0i +=pRXp -----END PGP SIGNATURE----- diff --git a/app-admin/sudo/sudo-1.7.4_p2.ebuild b/app-admin/sudo/sudo-1.7.4_p2.ebuild deleted file mode 100644 index b4a3d412522e..000000000000 --- a/app-admin/sudo/sudo-1.7.4_p2.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.4_p2.ebuild,v 1.1 2010/08/09 13:48:06 flameeyes Exp $ - -inherit eutils pam - -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="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz - 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 - ) - !pam? ( skey? ( >=sys-auth/skey-1.1.5-r1 ) ) - app-editors/gentoo-editor - 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() { - if use pam && use skey; then - ewarn "You cannot enable both S/KEY and PAM at the same time, PAM will" - ewarn "be used then." - fi -} - -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&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." - - if use pam; then - myconf="--with-pam --without-skey" - elif use skey; then - myconf="--without-pam --with-skey" - else - myconf="--without-pam --without-skey" - fi - - # audit: somebody got to explain me how I can test this before I - # enable it.. — Diego - econf --with-secure-path="${ROOTPATH}" \ - --with-editor=/usr/libexec/gentoo-editor \ - --with-env-editor \ - $(use_with offensive insults) \ - $(use_with offensive all-insults) \ - $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \ - $(use_with ldap) \ - --without-linux-audit \ - --with-timedir=/var/db/sudo \ - --docdir=/usr/share/doc/${PF} \ - ${myconf} - - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - if use ldap; then - dodoc README.LDAP schema.OpenLDAP - dosbin sudoers2ldif - - cat - > "${T}"/ldap.conf.sudo < = 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&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." + + if use pam; then + myconf="--with-pam --without-skey" + elif use skey; then + myconf="--without-pam --with-skey" + else + myconf="--without-pam --without-skey" + fi + + # audit: somebody got to explain me how I can test this before I + # enable it.. — Diego + econf --with-secure-path="${ROOTPATH}" \ + --with-editor=/usr/libexec/gentoo-editor \ + --with-env-editor \ + $(use_with offensive insults) \ + $(use_with offensive all-insults) \ + $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \ + $(use_with ldap) \ + --without-linux-audit \ + --with-timedir=/var/db/sudo \ + --docdir=/usr/share/doc/${PF} \ + ${myconf} + + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die + + if use ldap; then + dodoc README.LDAP schema.OpenLDAP + dosbin sudoers2ldif + + cat - > "${T}"/ldap.conf.sudo <