diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2013-01-31 11:36:10 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2013-01-31 11:36:10 +0000 |
| commit | 67a6ab8023a7adfe39ee6b697d5cf37e14b2746d (patch) | |
| tree | 3f90eac430f278ac51bd8cb35e18422acfdf64fe /sys-libs | |
| parent | Stable for amd64, wrt bug #454310 (diff) | |
| download | gentoo-2-67a6ab8023a7adfe39ee6b697d5cf37e14b2746d.tar.gz gentoo-2-67a6ab8023a7adfe39ee6b697d5cf37e14b2746d.tar.bz2 gentoo-2-67a6ab8023a7adfe39ee6b697d5cf37e14b2746d.zip | |
Revbump (to stable as well) to make sure that the sepermit path is correct at install time. Thanks Agostino for catching the brainfreeze there. Also only install the tmpfiles.d file if selinux USE flag is enabled. Remove redundant disable-dependency-tracking.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/pam/ChangeLog | 11 | ||||
| -rw-r--r-- | sys-libs/pam/pam-1.1.6-r2.ebuild (renamed from sys-libs/pam/pam-1.1.6-r1.ebuild) | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog index e75361cf06aa..3a9611c82a46 100644 --- a/sys-libs/pam/ChangeLog +++ b/sys-libs/pam/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-libs/pam # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.317 2013/01/30 22:43:52 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.318 2013/01/31 11:36:10 flameeyes Exp $ + +*pam-1.1.6-r2 (31 Jan 2013) + + 31 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org> +pam-1.1.6-r2.ebuild, + -pam-1.1.6-r1.ebuild: + Revbump (to stable as well) to make sure that the sepermit path is correct at + install time. Thanks Agostino for catching the brainfreeze there. Also only + install the tmpfiles.d file if selinux USE flag is enabled. Remove redundant + disable-dependency-tracking. 30 Jan 2013; Agostino Sarubbo <ago@gentoo.org> pam-1.1.6-r1.ebuild: Stable for x86, wrt bug #454664 diff --git a/sys-libs/pam/pam-1.1.6-r1.ebuild b/sys-libs/pam/pam-1.1.6-r2.ebuild index ccaa41daaffd..7f6327b56435 100644 --- a/sys-libs/pam/pam-1.1.6-r1.ebuild +++ b/sys-libs/pam/pam-1.1.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.6-r1.ebuild,v 1.3 2013/01/30 22:43:52 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.6-r2.ebuild,v 1.1 2013/01/31 11:36:10 flameeyes Exp $ EAPI=5 @@ -106,7 +106,6 @@ src_configure() { export ac_cv_header_xcrypt_h=no econf \ - --disable-dependency-tracking \ --enable-fast-install \ --libdir="${EPREFIX}"/usr/$(get_libdir) \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ @@ -138,7 +137,7 @@ src_install() { local lib emake DESTDIR="${D}" install \ - sepermitlockdir="${EPREFIX}/var//sepermit" + sepermitlockdir="${EPREFIX}/run/sepermit" # Need to be suid fperms u+s /sbin/unix_chkpwd @@ -164,10 +163,12 @@ src_install() { # don't need them for static linking either. find "${D}" -name '*.la' -delete - dodir /usr/lib/tmpfiles.d - cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF + if use selinux; then + dodir /usr/lib/tmpfiles.d + cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF d /run/sepermit 0755 root root EOF + fi } pkg_preinst() { |