Fix docs install #473650 by Martin von Gagern.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 332 insertions, 1 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index af75a9ff7bc3..6f6e68cfd850 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/pam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.334 2014/01/18 05:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.335 2014/05/08 23:07:19 vapier Exp $
+
+*pam-1.1.8-r1 (08 May 2014)
+
+  08 May 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/pam-1.1.8-doc-install.patch, +pam-1.1.8-r1.ebuild:
+  Fix docs install #473650 by Martin von Gagern.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> pam-1.1.6-r2.ebuild,
   pam-1.1.8.ebuild:
diff --git a/sys-libs/pam/files/pam-1.1.8-doc-install.patch b/sys-libs/pam/files/pam-1.1.8-doc-install.patch
new file mode 100644
index 000000000000..bdd5b9d48164
--- /dev/null
+++ b/sys-libs/pam/files/pam-1.1.8-doc-install.patch
@@ -0,0 +1,142 @@
+https://bugs.gentoo.org/473650
+https://fedorahosted.org/linux-pam/ticket/31
+
+fix doc installs when doing out of tree builds
+
+--- a/doc/adg/Makefile.in
++++ b/doc/adg/Makefile.in
+@@ -463,17 +463,17 @@ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(docdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(pdfdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
+-	test -f html/Linux-PAM_ADG.html || exit 0; \
++	test -f html/Linux-PAM_ADG.html -o -f $(srcdir)/html/Linux-PAM_ADG.html || exit 0; \
+ 	    $(install_sh_DATA) html/Linux-PAM_ADG.html html/adg-*.html \
+ 		$(DESTDIR)$(htmldir)/ || \
+ 	    $(install_sh_DATA) $(srcdir)/html/Linux-PAM_ADG.html \
+-		$(srcdir)/html/sag-*.html \
++		$(srcdir)/html/adg-*.html \
+ 		$(DESTDIR)$(htmldir)/
+-	test -f Linux-PAM_ADG.txt || exit 0; \
++	test -f Linux-PAM_ADG.txt -o -f $(srcdir)/Linux-PAM_ADG.txt || exit 0; \
+ 	    $(install_sh_DATA) Linux-PAM_ADG.txt $(DESTDIR)$(docdir)/ || \
+ 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_ADG.txt \
+ 		$(DESTDIR)$(docdir)/
+-	test -f Linux-PAM_ADG.pdf || exit 0; \
++	test -f Linux-PAM_ADG.pdf -o -f $(srcdir)/Linux-PAM_ADG.pdf || exit 0; \
+ 	    $(install_sh_DATA) Linux-PAM_ADG.pdf $(DESTDIR)$(pdfdir)/ || \
+ 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_ADG.pdf \
+ 		$(DESTDIR)$(pdfdir)/
+@@ -486,18 +486,18 @@ uninstall-local:
+ 
+ releasedocs: all
+ 	$(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html
+-	test -f html/Linux-PAM_ADG.html || exit 0; \
++	test -f html/Linux-PAM_ADG.html -o -f $(srcdir)/html/Linux-PAM_ADG.html || exit 0; \
+ 	    cp -ap html/Linux-PAM_ADG.html html/adg-*.html \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html/ || \
+ 	    cp -ap $(srcdir)/html/Linux-PAM_ADG.html \
+ 		$(srcdir)/html/adg-*.html \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html/
+-	test -f Linux-PAM_ADG.txt || exit 0; \
++	test -f Linux-PAM_ADG.txt -o -f $(srcdir)/Linux-PAM_ADG.txt || exit 0; \
+ 	    cp -p Linux-PAM_ADG.txt \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/ || \
+ 	    cp -p $(srcdir)/Linux-PAM_ADG.txt \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/
+-	test -f Linux-PAM_ADG.pdf || exit 0; \
++	test -f Linux-PAM_ADG.pdf -o -f $(srcdir)/Linux-PAM_ADG.pdf || exit 0; \
+ 	    cp -p Linux-PAM_ADG.pdf \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/ || \
+ 	    cp -p $(srcdir)/Linux-PAM_ADG.pdf \
+--- a/doc/mwg/Makefile.in
++++ b/doc/mwg/Makefile.in
+@@ -463,17 +463,17 @@ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(docdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(pdfdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
+-	test -f html/Linux-PAM_MWG.html || exit 0; \
++	test -f html/Linux-PAM_MWG.html -o -f $(srcdir)/html/Linux-PAM_MWG.html || exit 0; \
+ 	    $(install_sh_DATA) html/Linux-PAM_MWG.html html/mwg-*.html \
+ 		$(DESTDIR)$(htmldir)/ || \
+ 	    $(install_sh_DATA) $(srcdir)/html/Linux-PAM_MWG.html \
+-		$(srcdir)/html/sag-*.html \
++		$(srcdir)/html/mwg-*.html \
+ 		$(DESTDIR)$(htmldir)/
+-	test -f Linux-PAM_MWG.txt || exit 0; \
++	test -f Linux-PAM_MWG.txt -o -f $(srcdir)/Linux-PAM_MWG.txt || exit 0; \
+ 	    $(install_sh_DATA) Linux-PAM_MWG.txt $(DESTDIR)$(docdir)/ || \
+ 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_MWG.txt \
+ 		$(DESTDIR)$(docdir)/
+-	test -f Linux-PAM_MWG.pdf || exit 0; \
++	test -f Linux-PAM_MWG.pdf -o -f $(srcdir)/Linux-PAM_MWG.pdf || exit 0; \
+ 	    $(install_sh_DATA) Linux-PAM_MWG.pdf $(DESTDIR)$(pdfdir)/ || \
+ 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_MWG.pdf \
+ 		$(DESTDIR)$(pdfdir)/
+@@ -486,18 +486,18 @@ uninstall-local:
+ 
+ releasedocs: all
+ 	$(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html
+-	test -f html/Linux-PAM_MWG.html || exit 0; \
++	test -f html/Linux-PAM_MWG.html -o -f $(srcdir)/html/Linux-PAM_MWG.html || exit 0; \
+ 	    cp -ap html/Linux-PAM_MWG.html html/mwg-*.html \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html/ || \
+ 	    cp -ap $(srcdir)/html/Linux-PAM_MWG.html \
+ 		$(srcdir)/html/mwg-*.html \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html/
+-	test -f Linux-PAM_MWG.txt || exit 0; \
++	test -f Linux-PAM_MWG.txt -o -f $(srcdir)/Linux-PAM_MWG.txt || exit 0; \
+ 	    cp -p Linux-PAM_MWG.txt \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/ || \
+ 	    cp -p $(srcdir)/Linux-PAM_MWG.txt \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/
+-	test -f Linux-PAM_MWG.pdf || exit 0; \
++	test -f Linux-PAM_MWG.pdf -o -f $(srcdir)/Linux-PAM_MWG.pdf || exit 0; \
+ 	    cp -p Linux-PAM_MWG.pdf \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/ || \
+ 	    cp -p $(srcdir)/Linux-PAM_MWG.pdf \
+--- a/doc/sag/Makefile.in
++++ b/doc/sag/Makefile.in
+@@ -463,17 +463,17 @@ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(docdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(pdfdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
+-	test -f html/Linux-PAM_SAG.html || exit 0; \
++	test -f html/Linux-PAM_SAG.html -o -f $(srcdir)/html/Linux-PAM_SAG.html || exit 0; \
+ 	    $(install_sh_DATA) html/Linux-PAM_SAG.html html/sag-*.html \
+ 		$(DESTDIR)$(htmldir)/ || \
+ 	    $(install_sh_DATA) $(srcdir)/html/Linux-PAM_SAG.html \
+ 		$(srcdir)/html/sag-*.html \
+ 		$(DESTDIR)$(htmldir)/
+-	test -f Linux-PAM_SAG.txt || exit 0; \
++	test -f Linux-PAM_SAG.txt -o -f $(srcdir)/Linux-PAM_SAG.txt || exit 0; \
+ 	    $(install_sh_DATA) Linux-PAM_SAG.txt $(DESTDIR)$(docdir)/ || \
+ 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_SAG.txt \
+ 		$(DESTDIR)$(docdir)/
+-	test -f Linux-PAM_SAG.pdf || exit 0; \
++	test -f Linux-PAM_SAG.pdf -o -f $(srcdir)/Linux-PAM_SAG.pdf || exit 0; \
+ 	    $(install_sh_DATA) Linux-PAM_SAG.pdf $(DESTDIR)$(pdfdir)/ || \
+ 	    $(install_sh_DATA) $(srcdir)/Linux-PAM_SAG.pdf \
+ 		$(DESTDIR)$(pdfdir)/
+@@ -486,18 +486,18 @@ uninstall-local:
+ 
+ releasedocs: all
+ 	$(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html
+-	test -f html/Linux-PAM_SAG.html || exit 0; \
++	test -f html/Linux-PAM_SAG.html -o -f $(srcdir)/html/Linux-PAM_SAG.html || exit 0; \
+ 	    cp -ap html/Linux-PAM_SAG.html html/sag-*.html \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html/ || \
+ 	    cp -ap $(srcdir)/html/Linux-PAM_SAG.html \
+ 		$(srcdir)/html/sag-*.html \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html/
+-	test -f Linux-PAM_SAG.txt || exit 0; \
++	test -f Linux-PAM_SAG.txt -o -f $(srcdir)/Linux-PAM_SAG.txt || exit 0; \
+ 	    cp -p Linux-PAM_SAG.txt \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/ || \
+ 	    cp -p $(srcdir)/Linux-PAM_SAG.txt \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/
+-	test -f Linux-PAM_SAG.pdf || exit 0; \
++	test -f Linux-PAM_SAG.pdf -o -f $(srcdir)/Linux-PAM_SAG.pdf || exit 0; \
+ 	    cp -p Linux-PAM_SAG.pdf \
+ 		$(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/ || \
+ 	    cp -p $(srcdir)/Linux-PAM_SAG.pdf \
diff --git a/sys-libs/pam/pam-1.1.8-r1.ebuild b/sys-libs/pam/pam-1.1.8-r1.ebuild
new file mode 100644
index 000000000000..5a4377cefd6c
--- /dev/null
+++ b/sys-libs/pam/pam-1.1.8-r1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.8-r1.ebuild,v 1.1 2014/05/08 23:07:19 vapier Exp $
+
+EAPI=5
+
+inherit libtool multilib eutils pam toolchain-funcs flag-o-matic db-use autotools-utils
+
+MY_PN="Linux-PAM"
+MY_P="${MY_PN}-${PV}"
+
+HOMEPAGE="https://fedorahosted.org/linux-pam/"
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+
+SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2
+	http://www.linux-pam.org/documentation/${MY_P}-docs.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb nis"
+
+RDEPEND="nls? ( virtual/libintl )
+	cracklib? ( >=sys-libs/cracklib-2.8.3 )
+	audit? ( sys-process/audit )
+	selinux? ( >=sys-libs/libselinux-1.28 )
+	berkdb? ( sys-libs/db )
+	elibc_glibc? (
+		>=sys-libs/glibc-2.7
+		nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2
+	sys-devel/flex
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+PDEPEND="sys-auth/pambase
+	vim-syntax? ( app-vim/pam-syntax )"
+RDEPEND="${RDEPEND}
+	!<sys-apps/openrc-0.11.8
+	!sys-auth/openpam
+	!sys-auth/pam_userdb"
+
+S="${WORKDIR}/${MY_P}"
+
+check_old_modules() {
+	local retval="0"
+
+	if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then
+		eerror ""
+		eerror "Your current setup is using the pam_stack module."
+		eerror "This module is deprecated and no longer supported, and since version"
+		eerror "0.99 is no longer installed, nor provided by any other package."
+		eerror "The package will be built (to allow binary package builds), but will"
+		eerror "not be installed."
+		eerror "Please replace pam_stack usage with proper include directive usage,"
+		eerror "following the PAM Upgrade guide at the following URL"
+		eerror "  http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
+		eerror ""
+
+		retval=1
+	fi
+
+	if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; then
+		eerror ""
+		eerror "Your current setup is using one or more of the following modules,"
+		eerror "that are not built or supported anymore:"
+		eerror "pam_pwdb, pam_console"
+		eerror "If you are in real need for these modules, please contact the maintainers"
+		eerror "of PAM through http://bugs.gentoo.org/ providing information about its"
+		eerror "use cases."
+		eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
+		eerror "  http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
+		eerror ""
+
+		retval=1
+	fi
+
+	return $retval
+}
+
+pkg_pretend() {
+	# do not error out, this is just a warning, one could build a binpkg
+	# with old modules enabled.
+	check_old_modules
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.8-doc-install.patch #473650
+
+	elibtoolize
+}
+
+src_configure() {
+	# Disable automatic detection of libxcrypt; we _don't_ want the
+	# user to link libxcrypt in by default, since we won't track the
+	# dependency and allow to break PAM this way.
+	export ac_cv_header_xcrypt_h=no
+
+	local myeconfargs=(
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
+		--enable-isadir="${EPREFIX}"/$(get_libdir)/security
+		$(use_enable nls)
+		$(use_enable selinux)
+		$(use_enable cracklib)
+		$(use_enable audit)
+		$(use_enable debug)
+		$(use_enable berkdb db)
+		$(use_enable nis)
+		--with-db-uniquename=-$(db_findver sys-libs/db)
+		--disable-prelude
+	)
+
+	if use hppa || use elibc_FreeBSD; then
+		myeconfargs+=( --disable-pie )
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile sepermitlockdir="${EPREFIX}/run/sepermit"
+}
+
+DOCS=( CHANGELOG ChangeLog README AUTHORS Copyright NEWS )
+
+src_install() {
+	autotools-utils_src_install sepermitlockdir="${EPREFIX}/run/sepermit"
+
+	# Need to be suid
+	fperms u+s /sbin/unix_chkpwd
+
+	gen_usr_ldscript -a pam pamc pam_misc
+
+	# create extra symlinks just in case something depends on them...
+	local lib
+	for lib in pam pamc pam_misc; do
+		if ! [[ -f "${ED}"/$(get_libdir)/lib${lib}$(get_libname) ]]; then
+			dosym lib${lib}$(get_libname 0) /$(get_libdir)/lib${lib}$(get_libname)
+		fi
+	done
+
+	docinto modules
+	for dir in modules/pam_*; do
+		newdoc "${dir}"/README README."$(basename "${dir}")"
+	done
+
+	prune_libtool_files --all
+
+	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() {
+	check_old_modules || die "deprecated PAM modules still used"
+}
+
+pkg_postinst() {
+	ewarn "Some software with pre-loaded PAM libraries might experience"
+	ewarn "warnings or failures related to missing symbols and/or versions"
+	ewarn "after any update. While unfortunate this is a limit of the"
+	ewarn "implementation of PAM and the software, and it requires you to"
+	ewarn "restart the software manually after the update."
+	ewarn ""
+	ewarn "You can get a list of such software running a command like"
+	ewarn "  lsof / | egrep -i 'del.*libpam\\.so'"
+	ewarn ""
+	ewarn "Alternatively, simply reboot your system."
+	if [ -x "${EROOT}"/var/log/tallylog ] ; then
+		elog ""
+		elog "Because of a bug present up to version 1.1.1-r2, you have"
+		elog "an executable /var/log/tallylog file. You can safely"
+		elog "correct it by running the command"
+		elog "  chmod -x /var/log/tallylog"
+		elog ""
+	fi
+}