commit: 42bd1f101e777d779dd4b740a0a7f2bbe41a1432 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Mon Oct 1 22:20:22 2018 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Mon Oct 1 22:24:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42bd1f10
sys-libs/pam: Version bump (v1.3.1) - keywords will be restored later - regenerate-docu option does not work as expected for this release, so switch to the Docbook generations (the internet access is not needed) - remove vim-syntax flag as it is not really useful Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> sys-libs/pam/Manifest | 1 + sys-libs/pam/files/pam-remove-browsers.patch | 34 ++++++++ sys-libs/pam/pam-1.3.1.ebuild | 125 +++++++++++++++++++++++++++ 3 files changed, 160 insertions(+) diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest index 60abaf54be0..98fec7d3a14 100644 --- a/sys-libs/pam/Manifest +++ b/sys-libs/pam/Manifest @@ -2,3 +2,4 @@ DIST Linux-PAM-1.2.0-docs.tar.bz2 490586 BLAKE2B 1b4b6a7a2988f3f3e9f74edab9a4713 DIST Linux-PAM-1.2.1.tar.bz2 1279523 BLAKE2B 246f3742bcf1c6dc0fe0c3d203ec6262c59093b75170d1a376a6080540d638551bed2d7f6f193bb583c34f8fbc742d904dfc3e6f1776dc4479914485c6ce15d4 SHA512 4572aa1eaf5a1312410c74b5ed055b2592c5efe2bb82f59981da4e9e93555ad40aee3a89f446d9dc6c6af79efc04c33f739f66db9edc07e02479475a14e426da DIST Linux-PAM-1.3.0-docs.tar.bz2 492805 BLAKE2B 1dd48f65ae76e0d4d2c02664f9a2adac127604a7552ff70c378323a0de8141445332430205946823097170edf217122196ea03ae665284751fed3748d9f8ac3d SHA512 b6b8497e6a4307b3f9a2af1c74456a0577b848cbc5417fb88fabe305b67ca022a6bcf632d68faaaacc701cdcf6254ec196707551a1ea70985cdde6add68bbbfe DIST Linux-PAM-1.3.0.tar.bz2 1302820 BLAKE2B 0ed5553308e8bc4bef91746a1c79db41bf5f0a48a31796d5a13819387c0a04d553efa210435273ad8565d0a53f354817bc3e0f254e35a5e75b7b7b586cad5d16 SHA512 4a89ca4b6f4676107aca4018f7c11addf03495266b209cb11c913f8b5d191d9a1f72197715dcf2a69216b4036de88780bcbbb5a8652e386910d71ba1b6282e42 +DIST pam-1.3.1.tar.gz 749997 BLAKE2B 3b44c41daaa5810c53e3e2baeac1ab58463768fde433f874b9bd09c7c28cfd55e0f227c9a0c318e66444a3adb23c112a2db32d5c7211b07c84c2d4600a47ca5c SHA512 0c5019493b2ac42180ee9c4974a51329a2395a44f5f892c1ca567ec9b43cc3a9bce0212861d4dfb82eb236c5eaa682b27189ce672ed6cafa37d8801d059a944d diff --git a/sys-libs/pam/files/pam-remove-browsers.patch b/sys-libs/pam/files/pam-remove-browsers.patch new file mode 100644 index 00000000000..7e3ae99731a --- /dev/null +++ b/sys-libs/pam/files/pam-remove-browsers.patch @@ -0,0 +1,34 @@ +From baadfdc644fcb88170c358c449a731520e1747a5 Mon Sep 17 00:00:00 2001 +From: Mikle Kolyada <[email protected]> +Date: Mon, 1 Oct 2018 23:12:08 +0300 +Subject: [PATCH] configure.ac remobe browser logic for DocBook + +--- + configure.ac | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3012ceb..e7e7dac 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -554,17 +554,6 @@ JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.4//EN], + JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], + [DocBook XSL Stylesheets], [], enable_docu=no) + +-AC_PATH_PROG([BROWSER], [w3m]) +-if test ! -z "$BROWSER"; then +- BROWSER="$BROWSER -T text/html -dump" +-else +- AC_PATH_PROG([BROWSER], [elinks]) +- if test ! -z "$BROWSER"; then +- BROWSER="$BROWSER -no-numbering -no-references -dump" +- else +- enable_docu=no +- fi +-fi + + AC_PATH_PROG([FO2PDF], [fop]) + +-- +2.16.4 + diff --git a/sys-libs/pam/pam-1.3.1.ebuild b/sys-libs/pam/pam-1.3.1.ebuild new file mode 100644 index 00000000000..e890caea782 --- /dev/null +++ b/sys-libs/pam/pam-1.3.1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools db-use fcaps multilib-minimal toolchain-funcs + +DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)" +HOMEPAGE="https://github.com/linux-pam/linux-pam"; +SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="|| ( BSD GPL-2 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="audit berkdb +cracklib debug nis nls +pie selinux static-libs" + +DEPEND="app-text/docbook-xml-dtd:4.3 + app-text/docbook-xml-dtd:4.4 + app-text/docbook-xml-dtd:4.5 + nls? ( sys-devel/gettext )" + +RDEPEND="${DEPEND} + audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] ) + berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] ) + cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] ) + nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) + !<sys-apps/openrc-0.11.8 + !sys-auth/openpam + !sys-auth/pam_userdb" + +BDEPEND="virtual/pkgconfig" + +PDEPEND="sys-auth/pambase" + +S="${WORKDIR}/linux-${P}" + +src_prepare() { + default + eapply "${FILESDIR}/${PN}-remove-browsers.patch" + touch ChangeLog || die + eautoreconf +} + +multilib_src_configure() { + # Do not let user's BROWSER setting mess us up. #549684 + unset BROWSER + + # 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 myconf=( + --with-db-uniquename=-$(db_findver sys-libs/db) + --libdir=/usr/$(get_libdir) + --disable-prelude + $(use_enable audit) + $(use_enable berkdb db) + $(use_enable cracklib) + $(use_enable debug) + $(use_enable nis) + $(use_enable nls) + $(use_enable pie) + $(use_enable selinux) + $(use_enable static-libs static) + --enable-isadir='.' #464016 + ) + ECONF_SOURCE="${S}" econf ${myconf[@]} +} + +multilib_src_compile() { + emake sepermitlockdir="${EPREFIX}/run/sepermit" +} + +multilib_src_install() { + emake DESTDIR="${D}" install \ + sepermitlockdir="${EPREFIX}/run/sepermit" + + local prefix + if multilib_is_native_abi; then + prefix= + gen_usr_ldscript -a pam pamc pam_misc + else + prefix=/usr + fi + + # create extra symlinks just in case something depends on them... + local lib + for lib in pam pamc pam_misc; do + if ! [[ -f "${ED}"${prefix}/$(get_libdir)/lib${lib}$(get_libname) ]]; then + dosym lib${lib}$(get_libname 0) ${prefix}/$(get_libdir)/lib${lib}$(get_libname) + fi + done +} + +multilib_src_install_all() { + find "${ED}" -type f -name '*.la' -delete || die + + 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_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." + + # The pam_unix module needs to check the password of the user which requires + # read access to /etc/shadow only. + fcaps cap_dac_override sbin/unix_chkpwd +}
