Version bump, and remove old.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index ec183bb7c642897e33eeff4c399e67c89752ce8a..971f61004dc73c2eb044703ca6dd54319af7ebf8 100644 (file)
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.271 2011/08/11 10:58:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.272 2011/08/18 15:58:35 flameeyes Exp $
+
+*sudo-1.8.2 (18 Aug 2011)
+
+  18 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> -sudo-1.7.4_p4.ebuild,
+  +sudo-1.8.2.ebuild:
+  Version bump, and remove old.
 
   11 Aug 2011; Ulrich Mueller <ulm@gentoo.org> sudo-1.7.4_p4.ebuild,
   sudo-1.7.4_p5.ebuild, sudo-1.8.1_p2.ebuild:

diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 2c45dc35503e3fa23af633f4d0dfac3a4ce9ab67..f9b626701609680a30f92c0253583befc8929ede 100644 (file)
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
-DIST sudo-1.7.4p4.tar.gz 963663 RMD160 3b5eb69b4317c72def0e811c58a24df8c9c1c892 SHA1 c873f509f80d5722989a912a42a61ad27b71453f SHA256 38de3c3e08346b2b8dcb3cf7ed0813300d1a1d5696d0f338ea8a4ef232aacf97
 DIST sudo-1.7.4p5.tar.gz 966176 RMD160 24fcaa065f9efc229abcf2b70ec4faca03efa32d SHA1 bb9c9ff6ce6d4c70bdc546316442e7021ca754c2 SHA256 72e8e3545f314d342f178b0fee4b483e26d70ef132b081699be035da0f0acbba
 DIST sudo-1.8.1p2.tar.gz 1238804 RMD160 165029d462e737c885b1d32accb9b2b19411a0fb SHA1 b743b3d7bdb06de68ea24eedfe13530e8fbcae09 SHA256 281f90c80547cf22132e351e7f61c25ba4ba9cf393438468f318f9a7884026fb
-EBUILD sudo-1.7.4_p4.ebuild 7203 RMD160 35b03bb7df1c7b61aac1d9623c4a7274c15f7c54 SHA1 3fab1bc5b2507dfc9a23d2694ebc7ca09e85b1d5 SHA256 dae3a7883f53b8739f3c9f810bfa94fbe4afffa31c98a9f6c1920344b09dad10
+DIST sudo-1.8.2.tar.gz 1465051 RMD160 daebd7f67fff6429c3cb85260e9b11f0c3e28e3c SHA1 6a9400ba3e40394fd9c913219e3b6bb102bb3906 SHA256 37fe6ee670329bc45937fbe402e847f80b3a0a1c8fc9a66487e92b4b810152b0
 EBUILD sudo-1.7.4_p5.ebuild 7202 RMD160 6a25c3582d4a4765b58851e769ea13b06a90fd30 SHA1 6c0d870bc05e758f40f1028192a77836ff5a50ba SHA256 e5142ec5ea32a80daca760bf8413828bfba8aa3c54e9f58eed326da4661ebcb2
 EBUILD sudo-1.8.1_p2.ebuild 5023 RMD160 6cc4c74c556fb30d4be649cacd17ccbddc462035 SHA1 4fa61c1b66a474facb6dec81197f683708479df7 SHA256 3a9254ddf23fd89478bf4e0a818be90ed86d2daca292da89d2639f4aaa33ce7c
-MISC ChangeLog 39939 RMD160 7395b8426e572073425c0d9a95db80d502914e90 SHA1 2c35e21641290331410425b63d4621ccba79bb74 SHA256 da13b0b670e7aa240442826b4229764b745665f5036cff81ecbd03bb261c7a17
+EBUILD sudo-1.8.2.ebuild 5026 RMD160 3095c3d96224fe4feee8492e3eab1f96dd5e624d SHA1 bd29464a7493239c83a0c9741a9a7ad970294ab9 SHA256 0d308e8bf89ff9df9d40e076da7b293641cc1274f80b29fd8daec78e23378dd2
+MISC ChangeLog 40106 RMD160 40b187bf9e5afb8413ad7b060f1c14289c6c213d SHA1 3dc6b3f05e90c2cb5cfd87936b7ae7527d5d34e6 SHA256 bf6f09d793711d89f64be3e847f8a328d8a9d97ad29727a1186c27be13eaaec5
 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5DtykACgkQOeoy/oIi7uy2jgCg2b9e1Gh7awWNp7dULGagT7zh
-tf8AoOZBk0iV3PqLA4tDfQxR+Axi7yaB
-=rn2J
+iEYEARECAAYFAk5NNp8ACgkQAiZjviIA2XgELwCgsD0HckcM+rpcXYeNLaTiBUJt
+kVoAoI+a4Bg3n2CQE4EV20L23vfqF73v
+=3SUe
 -----END PGP SIGNATURE-----

diff --git a/app-admin/sudo/sudo-1.7.4_p4.ebuild b/app-admin/sudo/sudo-1.8.2.ebuild
similarity index 58%
rename from app-admin/sudo/sudo-1.7.4_p4.ebuild
rename to app-admin/sudo/sudo-1.8.2.ebuild
index 2f2c3deeb1febad5c697154a5b7f6b8d2665e9f8..0e443277a847261932117c1f45f8577cccef47d8 100644 (file)
--- a/app-admin/sudo/sudo-1.7.4_p4.ebuild
+++ b/app-admin/sudo/sudo-1.8.2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 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_p4.ebuild,v 1.7 2011/08/11 10:58:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.2.ebuild,v 1.1 2011/08/18 15:58:35 flameeyes Exp $
 
-inherit eutils pam
+EAPI=4
+
+inherit eutils pam multilib libtool
 
 MY_P=${P/_/}
 MY_P=${MY_P/beta/b}
@@ -26,16 +28,15 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="pam offensive ldap selinux skey"
 
 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-misc/editor-wrapper
+       >=app-misc/editor-wrapper-3
        virtual/editor
        virtual/mta"
 RDEPEND="selinux? ( sec-policy/selinux-sudo )
@@ -47,66 +48,15 @@ DEPEND="${DEPEND}
 
 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 $?
-               }
+REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
 
-               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."
+MAKEOPTS="${MAKEOPTS} SAMPLES="
 
-       # prevent binaries from being stripped.
-       sed -i 's/\($(INSTALL).*\) -s \(.*[(sudo|visudo)]\)/\1 \2/g' Makefile.in
+src_prepare() {
+       elibtoolize
 }
 
-src_compile() {
+src_configure() {
        local line ROOTPATH
 
        # FIXME: secure_path is a compile time setting. using ROOTPATH
@@ -154,40 +104,35 @@ src_compile() {
                }
 
                rmpath ROOTPATH '*/gcc-bin/*'
+               rmpath ROOTPATH '*/gnat-gcc-bin/*'
+               rmpath ROOTPATH '*/gnat-gcc/*'
 
        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-editor=/usr/libexec/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) \
+               $(use_with pam) \
+               $(use_with skey) \
+               --without-opie \
                --without-linux-audit \
                --with-timedir=/var/db/sudo \
-               --docdir=/usr/share/doc/${PF} \
-               ${myconf}
-
-       emake || die
+               --with-plugindir=/usr/$(get_libdir)/sudo \
+               --docdir=/usr/share/doc/${PF}
 }
 
 src_install() {
        emake DESTDIR="${D}" install || die
 
        if use ldap; then
-               dodoc README.LDAP schema.OpenLDAP
-               dosbin sudoers2ldif
+               dodoc README.LDAP doc/schema.OpenLDAP
+               dosbin plugins/sudoers/sudoers2ldif
 
                cat - > "${T}"/ldap.conf.sudo <<EOF
 # See ldap.conf(5) and README.LDAP for details\n"
@@ -204,10 +149,6 @@ EOF
 
        pamd_mimic system-auth sudo auth account session
 
-       insinto /etc
-       doins "${S}"/sudoers
-       fperms 0440 /etc/sudoers
-
        keepdir /var/db/sudo
        fperms 0700 /var/db/sudo
 }