diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-10 22:48:59 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-10 22:48:59 +0000 |
| commit | 76eea8510e0d788948eff86cbdaf4eea477eeccf (patch) | |
| tree | af8017f00836c221618eb44c93ab948d93bb5619 /app-admin | |
| parent | x86 stable per bug 362005 (diff) | |
| download | gentoo-2-76eea8510e0d788948eff86cbdaf4eea477eeccf.tar.gz gentoo-2-76eea8510e0d788948eff86cbdaf4eea477eeccf.tar.bz2 gentoo-2-76eea8510e0d788948eff86cbdaf4eea477eeccf.zip | |
Fix install in parallel and install of ldap-related files, thanks to Chris Coleman in bug #362877 for both.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/sudo/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/sudo/files/sudo-1.8.1-parallelinstall.patch | 11 | ||||
| -rw-r--r-- | app-admin/sudo/sudo-1.8.1.ebuild | 8 |
3 files changed, 22 insertions, 4 deletions
diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog index 0d1a5c19e48b..016735f2f728 100644 --- a/app-admin/sudo/ChangeLog +++ b/app-admin/sudo/ChangeLog @@ -1,6 +1,11 @@ # 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.267 2011/04/10 10:27:36 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.268 2011/04/10 22:48:59 flameeyes Exp $ + + 10 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> sudo-1.8.1.ebuild, + +files/sudo-1.8.1-parallelinstall.patch: + Fix install in parallel and install of ldap-related files, thanks to Chris + Coleman in bug #362877 for both. *sudo-1.8.1 (10 Apr 2011) *sudo-1.7.6 (10 Apr 2011) diff --git a/app-admin/sudo/files/sudo-1.8.1-parallelinstall.patch b/app-admin/sudo/files/sudo-1.8.1-parallelinstall.patch new file mode 100644 index 000000000000..e0d9421df52f --- /dev/null +++ b/app-admin/sudo/files/sudo-1.8.1-parallelinstall.patch @@ -0,0 +1,11 @@ +--- sudo-1.8.1.orig/plugins/sudoers/Makefile.in 2011-04-06 15:59:31.000000000 +0100 ++++ sudo-1.8.1/plugins/sudoers/Makefile.in 2011-04-10 18:41:26.009495892 +0100 +@@ -349,7 +349,7 @@ + + install-includes: + +-install-doc: ++install-doc: install-dirs + @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0555 $(srcdir)/sudoers2ldif $(DESTDIR)$(docdir) + + install-plugin: sudoers.la install-dirs diff --git a/app-admin/sudo/sudo-1.8.1.ebuild b/app-admin/sudo/sudo-1.8.1.ebuild index b87edb5af191..27623408cb7a 100644 --- a/app-admin/sudo/sudo-1.8.1.ebuild +++ b/app-admin/sudo/sudo-1.8.1.ebuild @@ -1,6 +1,6 @@ # 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.1.ebuild,v 1.1 2011/04/10 10:27:36 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1.ebuild,v 1.2 2011/04/10 22:48:59 flameeyes Exp $ EAPI=4 @@ -53,6 +53,8 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" MAKEOPTS="${MAKEOPTS} SAMPLES=" src_prepare() { + epatch "${FILESDIR}"/${P}-parallelinstall.patch + elibtoolize } @@ -131,8 +133,8 @@ 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" |