Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/pam/, sys-libs/pam/files/
Date: Mon, 01 Oct 2018 22:25:33
Message-Id: 1538432653.42bd1f101e777d779dd4b740a0a7f2bbe41a1432.zlogene@gentoo
1 commit: 42bd1f101e777d779dd4b740a0a7f2bbe41a1432
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 1 22:20:22 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 1 22:24:13 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42bd1f10
7
8 sys-libs/pam: Version bump (v1.3.1)
9
10 - keywords will be restored later
11 - regenerate-docu option does not work as
12 expected for this release, so switch to the Docbook generations
13 (the internet access is not needed)
14 - remove vim-syntax flag as it is not really useful
15
16 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
17
18 sys-libs/pam/Manifest | 1 +
19 sys-libs/pam/files/pam-remove-browsers.patch | 34 ++++++++
20 sys-libs/pam/pam-1.3.1.ebuild | 125 +++++++++++++++++++++++++++
21 3 files changed, 160 insertions(+)
22
23 diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
24 index 60abaf54be0..98fec7d3a14 100644
25 --- a/sys-libs/pam/Manifest
26 +++ b/sys-libs/pam/Manifest
27 @@ -2,3 +2,4 @@ DIST Linux-PAM-1.2.0-docs.tar.bz2 490586 BLAKE2B 1b4b6a7a2988f3f3e9f74edab9a4713
28 DIST Linux-PAM-1.2.1.tar.bz2 1279523 BLAKE2B 246f3742bcf1c6dc0fe0c3d203ec6262c59093b75170d1a376a6080540d638551bed2d7f6f193bb583c34f8fbc742d904dfc3e6f1776dc4479914485c6ce15d4 SHA512 4572aa1eaf5a1312410c74b5ed055b2592c5efe2bb82f59981da4e9e93555ad40aee3a89f446d9dc6c6af79efc04c33f739f66db9edc07e02479475a14e426da
29 DIST Linux-PAM-1.3.0-docs.tar.bz2 492805 BLAKE2B 1dd48f65ae76e0d4d2c02664f9a2adac127604a7552ff70c378323a0de8141445332430205946823097170edf217122196ea03ae665284751fed3748d9f8ac3d SHA512 b6b8497e6a4307b3f9a2af1c74456a0577b848cbc5417fb88fabe305b67ca022a6bcf632d68faaaacc701cdcf6254ec196707551a1ea70985cdde6add68bbbfe
30 DIST Linux-PAM-1.3.0.tar.bz2 1302820 BLAKE2B 0ed5553308e8bc4bef91746a1c79db41bf5f0a48a31796d5a13819387c0a04d553efa210435273ad8565d0a53f354817bc3e0f254e35a5e75b7b7b586cad5d16 SHA512 4a89ca4b6f4676107aca4018f7c11addf03495266b209cb11c913f8b5d191d9a1f72197715dcf2a69216b4036de88780bcbbb5a8652e386910d71ba1b6282e42
31 +DIST pam-1.3.1.tar.gz 749997 BLAKE2B 3b44c41daaa5810c53e3e2baeac1ab58463768fde433f874b9bd09c7c28cfd55e0f227c9a0c318e66444a3adb23c112a2db32d5c7211b07c84c2d4600a47ca5c SHA512 0c5019493b2ac42180ee9c4974a51329a2395a44f5f892c1ca567ec9b43cc3a9bce0212861d4dfb82eb236c5eaa682b27189ce672ed6cafa37d8801d059a944d
32
33 diff --git a/sys-libs/pam/files/pam-remove-browsers.patch b/sys-libs/pam/files/pam-remove-browsers.patch
34 new file mode 100644
35 index 00000000000..7e3ae99731a
36 --- /dev/null
37 +++ b/sys-libs/pam/files/pam-remove-browsers.patch
38 @@ -0,0 +1,34 @@
39 +From baadfdc644fcb88170c358c449a731520e1747a5 Mon Sep 17 00:00:00 2001
40 +From: Mikle Kolyada <zlogene@g.o>
41 +Date: Mon, 1 Oct 2018 23:12:08 +0300
42 +Subject: [PATCH] configure.ac remobe browser logic for DocBook
43 +
44 +---
45 + configure.ac | 11 -----------
46 + 1 file changed, 11 deletions(-)
47 +
48 +diff --git a/configure.ac b/configure.ac
49 +index 3012ceb..e7e7dac 100644
50 +--- a/configure.ac
51 ++++ b/configure.ac
52 +@@ -554,17 +554,6 @@ JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.4//EN],
53 + JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
54 + [DocBook XSL Stylesheets], [], enable_docu=no)
55 +
56 +-AC_PATH_PROG([BROWSER], [w3m])
57 +-if test ! -z "$BROWSER"; then
58 +- BROWSER="$BROWSER -T text/html -dump"
59 +-else
60 +- AC_PATH_PROG([BROWSER], [elinks])
61 +- if test ! -z "$BROWSER"; then
62 +- BROWSER="$BROWSER -no-numbering -no-references -dump"
63 +- else
64 +- enable_docu=no
65 +- fi
66 +-fi
67 +
68 + AC_PATH_PROG([FO2PDF], [fop])
69 +
70 +--
71 +2.16.4
72 +
73
74 diff --git a/sys-libs/pam/pam-1.3.1.ebuild b/sys-libs/pam/pam-1.3.1.ebuild
75 new file mode 100644
76 index 00000000000..e890caea782
77 --- /dev/null
78 +++ b/sys-libs/pam/pam-1.3.1.ebuild
79 @@ -0,0 +1,125 @@
80 +# Copyright 1999-2018 Gentoo Authors
81 +# Distributed under the terms of the GNU General Public License v2
82 +
83 +EAPI=6
84 +
85 +inherit autotools db-use fcaps multilib-minimal toolchain-funcs
86 +
87 +DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
88 +HOMEPAGE="https://github.com/linux-pam/linux-pam"
89 +SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
90 +
91 +LICENSE="|| ( BSD GPL-2 )"
92 +SLOT="0"
93 +KEYWORDS="~amd64 ~x86"
94 +IUSE="audit berkdb +cracklib debug nis nls +pie selinux static-libs"
95 +
96 +DEPEND="app-text/docbook-xml-dtd:4.3
97 + app-text/docbook-xml-dtd:4.4
98 + app-text/docbook-xml-dtd:4.5
99 + nls? ( sys-devel/gettext )"
100 +
101 +RDEPEND="${DEPEND}
102 + audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
103 + berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
104 + cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
105 + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
106 + nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )
107 + nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
108 + !<sys-apps/openrc-0.11.8
109 + !sys-auth/openpam
110 + !sys-auth/pam_userdb"
111 +
112 +BDEPEND="virtual/pkgconfig"
113 +
114 +PDEPEND="sys-auth/pambase"
115 +
116 +S="${WORKDIR}/linux-${P}"
117 +
118 +src_prepare() {
119 + default
120 + eapply "${FILESDIR}/${PN}-remove-browsers.patch"
121 + touch ChangeLog || die
122 + eautoreconf
123 +}
124 +
125 +multilib_src_configure() {
126 + # Do not let user's BROWSER setting mess us up. #549684
127 + unset BROWSER
128 +
129 + # Disable automatic detection of libxcrypt; we _don't_ want the
130 + # user to link libxcrypt in by default, since we won't track the
131 + # dependency and allow to break PAM this way.
132 +
133 + export ac_cv_header_xcrypt_h=no
134 +
135 + local myconf=(
136 + --with-db-uniquename=-$(db_findver sys-libs/db)
137 + --libdir=/usr/$(get_libdir)
138 + --disable-prelude
139 + $(use_enable audit)
140 + $(use_enable berkdb db)
141 + $(use_enable cracklib)
142 + $(use_enable debug)
143 + $(use_enable nis)
144 + $(use_enable nls)
145 + $(use_enable pie)
146 + $(use_enable selinux)
147 + $(use_enable static-libs static)
148 + --enable-isadir='.' #464016
149 + )
150 + ECONF_SOURCE="${S}" econf ${myconf[@]}
151 +}
152 +
153 +multilib_src_compile() {
154 + emake sepermitlockdir="${EPREFIX}/run/sepermit"
155 +}
156 +
157 +multilib_src_install() {
158 + emake DESTDIR="${D}" install \
159 + sepermitlockdir="${EPREFIX}/run/sepermit"
160 +
161 + local prefix
162 + if multilib_is_native_abi; then
163 + prefix=
164 + gen_usr_ldscript -a pam pamc pam_misc
165 + else
166 + prefix=/usr
167 + fi
168 +
169 + # create extra symlinks just in case something depends on them...
170 + local lib
171 + for lib in pam pamc pam_misc; do
172 + if ! [[ -f "${ED}"${prefix}/$(get_libdir)/lib${lib}$(get_libname) ]]; then
173 + dosym lib${lib}$(get_libname 0) ${prefix}/$(get_libdir)/lib${lib}$(get_libname)
174 + fi
175 + done
176 +}
177 +
178 +multilib_src_install_all() {
179 + find "${ED}" -type f -name '*.la' -delete || die
180 +
181 + if use selinux; then
182 + dodir /usr/lib/tmpfiles.d
183 + cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
184 +d /run/sepermit 0755 root root
185 +EOF
186 + fi
187 +}
188 +
189 +pkg_postinst() {
190 + ewarn "Some software with pre-loaded PAM libraries might experience"
191 + ewarn "warnings or failures related to missing symbols and/or versions"
192 + ewarn "after any update. While unfortunate this is a limit of the"
193 + ewarn "implementation of PAM and the software, and it requires you to"
194 + ewarn "restart the software manually after the update."
195 + ewarn ""
196 + ewarn "You can get a list of such software running a command like"
197 + ewarn " lsof / | egrep -i 'del.*libpam\\.so'"
198 + ewarn ""
199 + ewarn "Alternatively, simply reboot your system."
200 +
201 + # The pam_unix module needs to check the password of the user which requires
202 + # read access to /etc/shadow only.
203 + fcaps cap_dac_override sbin/unix_chkpwd
204 +}