From 141df1b0464b2646a4d31c2b0120d5306bb33a46 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 15 Nov 2011 06:05:28 +0000 Subject: [PATCH] Simplify ebuild a bit, and fix translation installation wrt LINGUAS. Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- app-admin/sudo/ChangeLog | 8 +- app-admin/sudo/Manifest | 12 +- .../sudo/files/sudo-1.8.3_p1-linguas.patch | 25 +++ app-admin/sudo/sudo-1.8.3_p1-r1.ebuild | 173 ++++++++++++++++++ 4 files changed, 212 insertions(+), 6 deletions(-) create mode 100644 app-admin/sudo/files/sudo-1.8.3_p1-linguas.patch create mode 100644 app-admin/sudo/sudo-1.8.3_p1-r1.ebuild diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog index 876b3efcd19e..815c7f4bddaa 100644 --- 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.284 2011/10/28 14:36:52 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.285 2011/11/15 06:05:28 vapier Exp $ + +*sudo-1.8.3_p1-r1 (15 Nov 2011) + + 15 Nov 2011; Mike Frysinger +sudo-1.8.3_p1-r1.ebuild, + +files/sudo-1.8.3_p1-linguas.patch: + Simplify ebuild a bit, and fix translation installation wrt LINGUAS. *sudo-1.8.3_p1 (28 Oct 2011) diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index 17dc270e7e88..abe94c292824 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -1,8 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX sudo-1.8.2-fix-pwutil-alignment.patch 1641 RMD160 d136752a7180bf46dfa24c522ad6ade3979e689c SHA1 36c518048ffc601d04b3edc4007528fd425328e7 SHA256 7922f150462214312ca00048b93aa99aac454e5a61cc92fbe6d57354694ca2ef AUX sudo-1.8.2-parallel-build.patch 517 RMD160 1fa308ce579f9c3e8d32b6155ee6e89044c2997e SHA1 8237b096164527704e865f95cd563b5d5aa01d22 SHA256 f21f4c60c8d9bbbf8ff372393e5d753a123021573dc4ace9665ff451dda9326c +AUX sudo-1.8.3_p1-linguas.patch 1004 RMD160 ba9f5d2ac57ed53de0388da02d29ef3e84a7b4fd SHA1 0d6d629e11eda546e1a9486bc93ede54b8019fe1 SHA256 68687a3817c8ca38802c93cbbdf24ad7fde8ef4515da691929362e85a14336ec AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d 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 @@ -11,13 +12,14 @@ DIST sudo-1.8.3p1.tar.gz 1536465 RMD160 7809cbde339220d7dc10ae8da504d5c4e219b55c EBUILD sudo-1.7.4_p5.ebuild 7202 RMD160 6a25c3582d4a4765b58851e769ea13b06a90fd30 SHA1 6c0d870bc05e758f40f1028192a77836ff5a50ba SHA256 e5142ec5ea32a80daca760bf8413828bfba8aa3c54e9f58eed326da4661ebcb2 EBUILD sudo-1.8.1_p2.ebuild 5052 RMD160 830050dd4b7d2aea5b12fcfa4c659400e00b95ab SHA1 18ce6dfc5d645f0a5a5968ae344e9b6ec33efac8 SHA256 6485402e94a6229f4f89980b10b927150372040dc24e295cbafb8cca969aa305 EBUILD sudo-1.8.2-r1.ebuild 5208 RMD160 b6dee6dac8d10b6afd9d4419fedf5693b2592335 SHA1 45826e9a6478ff9c0a2c9c0a6f4bc8c31258eed4 SHA256 2f3fc06da841356c8524c48c388d0b181ae3edaeb6c8448cca2cd790df7ff544 +EBUILD sudo-1.8.3_p1-r1.ebuild 4675 RMD160 b540f8d8828269a583a394632201fc840c21c6c3 SHA1 b99162461b01fa4c160528ab6f12d972331f3221 SHA256 75358f5b8880ff89976fb9838b9447363fbeca75fbd35e7518b51e4bc3cad53a EBUILD sudo-1.8.3_p1.ebuild 5109 RMD160 b958efc43a95bf1a5a1cb4f196df22317d0d1b4b SHA1 c069b14b38274cf53a711de3e422d4f58f31a917 SHA256 b79fb3d8a91f29d5a1472be1892e4510cd658c5cd0c5b31364bb9658244176fc -MISC ChangeLog 41736 RMD160 34309f1e1ca14833814f06bba7776536e9fd5e0f SHA1 e290fa0f55761db33c8a3eef98aa049bd18b4cc2 SHA256 2136cc102c56e5b0b8bb309e4d9f057c93daf594233d2c3b28e5d69c1edb59d4 +MISC ChangeLog 41952 RMD160 39d625b5698d379d367bbf6b7b77a5ba8c593b15 SHA1 e3270b964a0115780dca804643b7540e819939f9 SHA256 540e7db4b4ac5551f80ffd39fe3482833959d1190a5d94f3e9588dae47104ce1 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6qve0ACgkQAiZjviIA2Xhp6QCdFodXi+YkP4+kAT4B88vOh9Q4 -MGgAniZ2lLyBQaTkUL790XDUs0wmACFK -=WjT5 +iF4EAREIAAYFAk7CAS8ACgkQaC/OocHi7JbXEgD/c9G1jDIrdEI2mnVyIxUJUPIr +9ktjuWWtjzFDS3n6XQEA/1EPCcEz7LATtY4jzjsPekIhe88BnF+fx5A8yTnpGp21 +=Q0pY -----END PGP SIGNATURE----- diff --git a/app-admin/sudo/files/sudo-1.8.3_p1-linguas.patch b/app-admin/sudo/files/sudo-1.8.3_p1-linguas.patch new file mode 100644 index 000000000000..68c34aa48fc2 --- /dev/null +++ b/app-admin/sudo/files/sudo-1.8.3_p1-linguas.patch @@ -0,0 +1,25 @@ +respect user LINGUAS when installing translations + +http://www.sudo.ws/pipermail/sudo-workers/2011-November/000701.html + +diff -r ecd3533cb711 -r f99b940123fa Makefile.in +--- a/Makefile.in Fri Oct 07 13:52:45 2011 -0400 ++++ b/Makefile.in Tue Nov 15 00:53:52 2011 -0500 +@@ -226,6 +226,7 @@ + + install-nls: + @if test "$(NLS)" = "enabled"; then \ ++ install_mos="$(LINGUAS)"; \ + cd $(top_srcdir); \ + for pot in $(POTFILES); do \ + podir=`dirname $$pot`; \ +@@ -233,6 +234,9 @@ + echo $(ECHO_N) "Installing $$domain message catalogs:$(ECHO_C)"; \ + for mo in $$podir/*.mo; do \ + lang=`basename $$mo .mo`; \ ++ if [ -n "$$install_mos" ]; then \ ++ case " $$install_mos " in *" $$lang "*) :;; *) continue;; esac; \ ++ fi; \ + echo $(ECHO_N) " $$lang$(ECHO_C)"; \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ + $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0644 $$mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$$domain.mo; \ diff --git a/app-admin/sudo/sudo-1.8.3_p1-r1.ebuild b/app-admin/sudo/sudo-1.8.3_p1-r1.ebuild new file mode 100644 index 000000000000..1632b6692625 --- /dev/null +++ b/app-admin/sudo/sudo-1.8.3_p1-r1.ebuild @@ -0,0 +1,173 @@ +# 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.8.3_p1-r1.ebuild,v 1.1 2011/11/15 06:05:28 vapier Exp $ + +EAPI="4" + +inherit eutils pam libtool + +MY_P=${P/_/} +MY_P=${MY_P/beta/b} + +uri_prefix= +case ${P} in +*_beta*|*_rc*) uri_prefix=beta/ ;; +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 offensive ldap selinux skey" + +DEPEND="pam? ( virtual/pam ) + skey? ( >=sys-auth/skey-1.1.5-r1 ) + ldap? ( + >=net-nds/openldap-2.1.30-r1 + dev-libs/cyrus-sasl + ) + >=app-misc/editor-wrapper-3 + sys-libs/zlib + 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} + +REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" + +MAKEOPTS+=" SAMPLES=" + +src_prepare() { + epatch "${FILESDIR}"/${P}-linguas.patch + elibtoolize +} + +set_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 ..." + + # first extract the default ROOTPATH from build env + ROOTPATH=$(unset ROOTPATH; . /etc/profile.env; echo "${ROOTPATH}") + if [[ -z ${ROOTPATH} ]] ; then + ewarn " Failed to find ROOTPATH, please report this" + fi + + # then remove duplicate path entries + cleanpath() { + local newpath thisp IFS=: + for thisp in $1 ; do + if [[ :${newpath}: != *:${thisp}:* ]] ; then + newpath+=:$thisp + else + einfo " Duplicate entry ${thisp} removed..." + fi + done + ROOTPATH=${newpath#:} + } + cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}} + + # finally, strip gcc paths #136027 + rmpath() { + local e newpath thisp IFS=: + for thisp in ${ROOTPATH} ; do + for e ; do [[ $thisp == $e ]] && continue 2 ; done + newpath+=:$thisp + done + ROOTPATH=${newpath#:} + } + rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*' + + einfo "... done" +} + +src_configure() { + local ROOTPATH + set_rootpath + + # audit: somebody got to explain me how I can test this before I + # enable it.. - Diego + econf \ + --enable-zlib=system \ + --with-secure-path="${ROOTPATH}" \ + --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 \ + --with-plugindir='${libdir}'/sudo \ + --docdir=/usr/share/doc/${PF} +} + +src_install() { + emake DESTDIR="${D}" install || die + + if use ldap ; then + dodoc README.LDAP doc/schema.OpenLDAP + dosbin plugins/sudoers/sudoers2ldif + + cat <<-EOF > "${T}"/ldap.conf.sudo + # See ldap.conf(5) and README.LDAP for details + # This file should only be readable by root + + # supported directives: host, port, ssl, ldap_version + # uri, binddn, bindpw, sudoers_base, sudoers_debug + # 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 session + + keepdir /var/db/sudo + fperms 0700 /var/db/sudo +} + +pkg_postinst() { + if use ldap ; then + ewarn + ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration." + ewarn + if grep -qs '^[[: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 + + elog "To use the -A (askpass) option, you need to install a compatible" + elog "password program from the following list. Starred packages will" + elog "automatically register for the use with sudo (but will not force" + elog "the -A option):" + elog "" + elog " [*] net-misc/ssh-askpass-fullscreen" + elog " net-misc/x11-ssh-askpass" + elog "" + elog "You can override the choice by setting the SUDO_ASKPASS environmnent" + elog "variable to the program you want to use." +} -- 2.26.2