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: Thu, 20 Aug 2020 15:06:00
Message-Id: 1597935943.0afab06f071e27b6e2b0880dceb849ff03548025.zlogene@gentoo
1 commit: 0afab06f071e27b6e2b0880dceb849ff03548025
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 20 15:05:43 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 20 15:05:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0afab06f
7
8 sys-libs/pam: Drop old
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.23
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 sys-libs/pam/Manifest | 2 -
14 sys-libs/pam/files/fix-test-calls.patch | 48 ------------
15 sys-libs/pam/pam-1.4.0-r2.ebuild | 130 --------------------------------
16 3 files changed, 180 deletions(-)
17
18 diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
19 index e6fa0ea94f5..7dbfbf4a1a8 100644
20 --- a/sys-libs/pam/Manifest
21 +++ b/sys-libs/pam/Manifest
22 @@ -1,5 +1,3 @@
23 -DIST pam-1.4.0-doc.tar.xz 48080 BLAKE2B 48cec348c3db7ecae6ea85934fa242d908643d0a8f6d1789a8aac3b254dc21439e11066f9ff2a7238e61e5d16c41a6c49a26dbc7351fe7eb0a1fef4a2f69378e SHA512 634cbb1b948a2b1431b9ef219a4e9e63e870b34520665170f55aca10e65cd46f0c190697cafd18a42caeaec26299f63fd8ad794ae379648e767d8481af6c36f2
24 -DIST pam-1.4.0.tar.gz 804586 BLAKE2B 941925677c19f0a77a4fbc29f723706d5eb31b4020b0d35732ae3c00e5a623c943ea784e11aef1c2d5092d2a7fbe1724eeefa45d8d8ebd8a053a39f01a8b541c SHA512 16003f5c118125aeabf22503bc328a4bdd68b3af35d70b608a8b261adbaffae58ce490765f246c469b2ffbff67bd5216e0586ece0eb934905074423a990c2f98
25 DIST pam-1.4.0_p20200809-doc.tar.xz 42680 BLAKE2B e8371bd76b589db06ce95f2d10343be163aa5149f566f7d9bd5e9cd0340b95eecedb6a7d20d299fd2188c736fca3c69c0bd2f8eea4541dfd3312227c3dcf4e2d SHA512 5007aaa811b6321f124245493c6a4bc9ae07ab4ff651fc817843e8b4a74661c07418e2479363a72c35320f0f1cb469a2494c5d354dc819b920de7d1918e6ce5e
26 DIST pam-4dd9b97b762cc73816cb867d49c9d0d0b91d642c.tar.gz 765455 BLAKE2B 8a8543b51c9fa877cd48d483d9af489df00376f92f26fea648d38a0ce3168702888a662e5d3c7423cce8a5d56896e84e4c1829e56d08fca8c3ab878b20945a7d SHA512 bdb236a47a5810449fb96546ff89d70dec185a215b0d047178a12e40945fde4ffdb801dbbd87ff95eead1bb7acb4748333a2d3383881d5de0dbd89ec5ceddd3f
27 DIST pam-d5cb4409ab6b04a6ed7c00245e2c9a430f352b16.tar.gz 810548 BLAKE2B e061528fa57ba9fcb418422d368b7bb960b5f6eec3ed4b9e438be0ec4acdaf925af3322a334ced8c498e700b090ae37f5084f13d2bf8c6874d53c58f03548bc7 SHA512 3db1e13bc8a037b22e0ae1aac0311982877a2e2d33643ee32813025f9a9c727421f2fd6c442eba936e8043c59deb476daf78fda34fc7b6b95c015614751975f4
28
29 diff --git a/sys-libs/pam/files/fix-test-calls.patch b/sys-libs/pam/files/fix-test-calls.patch
30 deleted file mode 100644
31 index 32d4c2d9499..00000000000
32 --- a/sys-libs/pam/files/fix-test-calls.patch
33 +++ /dev/null
34 @@ -1,48 +0,0 @@
35 -From c5700c0a04c85ace09f6a179cc7a3692c07282b0 Mon Sep 17 00:00:00 2001
36 -From: "Dmitry V. Levin" <ldv@××××××××.org>
37 -Date: Mon, 15 Jun 2020 16:00:00 +0000
38 -Subject: [PATCH] configure.ac: fix non-portable use of test builtin
39 -
40 -Portable code should not assume that test builtin supports == operator.
41 -
42 -* configure.ac (opt_uidmin, opt_sysuidmin, opt_kerneloverflowuid): Fix
43 -initialization.
44 -
45 -Resolves: https://github.com/linux-pam/linux-pam/issues/241
46 -Fixes: 926d7935e ("pam_usertype: new module to tell if uid is in login.defs ranges")
47 ----
48 - configure.ac | 15 ++++++---------
49 - 1 file changed, 6 insertions(+), 9 deletions(-)
50 -
51 -diff --git a/configure.ac b/configure.ac
52 -index c1862ea7..7737efc7 100644
53 ---- a/configure.ac
54 -+++ b/configure.ac
55 -@@ -662,21 +662,18 @@ dnl
56 - dnl Get values for default uid ranges in login.defs used in pam_usertype
57 - dnl
58 - AC_ARG_WITH([uidmin], AS_HELP_STRING([--with-uidmin=<number>],[default value for regular user min uid (1000)]), opt_uidmin=$withval)
59 --if test x"$opt_uidmin" == x; then
60 -- opt_uidmin=1000
61 --fi
62 -+test -n "$opt_uidmin" ||
63 -+ opt_uidmin=1000
64 - AC_DEFINE_UNQUOTED(PAM_USERTYPE_UIDMIN, $opt_uidmin, [Minimum regular user uid.])
65 -
66 - AC_ARG_WITH([sysuidmin], AS_HELP_STRING([--with-sysuidmin=<number>],[default value for system user min uid (101)]), opt_sysuidmin=$withval)
67 --if test x"$opt_sysuidmin" == x; then
68 -- opt_sysuidmin=101
69 --fi
70 -+test -n "$opt_sysuidmin" ||
71 -+ opt_sysuidmin=101
72 - AC_DEFINE_UNQUOTED(PAM_USERTYPE_SYSUIDMIN, $opt_sysuidmin, [Minimum system user uid.])
73 -
74 - AC_ARG_WITH([kerneloverflowuid], AS_HELP_STRING([--with-kernel-overflow-uid=<number>],[kernel overflow uid, default (uint16_t)-2=65534]), opt_kerneloverflowuid=$withval)
75 --if test x"$opt_kerneloverflowuid" == x; then
76 -- opt_kerneloverflowuid=65534
77 --fi
78 -+test -n "$opt_kerneloverflowuid" ||
79 -+ opt_kerneloverflowuid=65534
80 - AC_DEFINE_UNQUOTED(PAM_USERTYPE_OVERFLOW_UID, $opt_kerneloverflowuid, [Kernel overflow uid.])
81 -
82 - AC_ARG_ENABLE([tally],
83
84 diff --git a/sys-libs/pam/pam-1.4.0-r2.ebuild b/sys-libs/pam/pam-1.4.0-r2.ebuild
85 deleted file mode 100644
86 index 95952e5cfb4..00000000000
87 --- a/sys-libs/pam/pam-1.4.0-r2.ebuild
88 +++ /dev/null
89 @@ -1,130 +0,0 @@
90 -# Copyright 1999-2020 Gentoo Authors
91 -# Distributed under the terms of the GNU General Public License v2
92 -
93 -EAPI=7
94 -
95 -inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
96 -
97 -DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
98 -HOMEPAGE="https://github.com/linux-pam/linux-pam"
99 -
100 -SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.tar.gz
101 - https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}-doc.tar.xz"
102 -
103 -LICENSE="|| ( BSD GPL-2 )"
104 -SLOT="0"
105 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
106 -IUSE="audit berkdb debug nis +pie selinux static-libs"
107 -
108 -BDEPEND="
109 - dev-libs/libxslt
110 - sys-devel/flex
111 - sys-devel/gettext
112 - virtual/pkgconfig
113 -"
114 -
115 -DEPEND="
116 - virtual/libcrypt:=[${MULTILIB_USEDEP}]
117 - >=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
118 - audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
119 - berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
120 - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
121 - nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
122 -
123 -RDEPEND="${DEPEND}"
124 -
125 -PDEPEND=">=sys-auth/pambase-20200616"
126 -
127 -S="${WORKDIR}/linux-${P}"
128 -
129 -src_prepare() {
130 - default
131 - touch ChangeLog || die
132 - eapply "${FILESDIR}"/fix-test-calls.patch
133 - eautoreconf
134 -}
135 -
136 -multilib_src_configure() {
137 - # Do not let user's BROWSER setting mess us up. #549684
138 - unset BROWSER
139 -
140 - # Disable automatic detection of libxcrypt; we _don't_ want the
141 - # user to link libxcrypt in by default, since we won't track the
142 - # dependency and allow to break PAM this way.
143 -
144 - export ac_cv_header_xcrypt_h=no
145 -
146 - local myconf=(
147 - CC_FOR_BUILD="$(tc-getBUILD_CC)"
148 - --with-db-uniquename=-$(db_findver sys-libs/db)
149 - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog
150 - --enable-securedir="${EPREFIX}"/$(get_libdir)/security
151 - --includedir="${EPREFIX}"/usr/include/security
152 - --libdir="${EPREFIX}"/usr/$(get_libdir)
153 - --exec-prefix="${EPREFIX}"
154 - --disable-prelude
155 - --disable-cracklib
156 - --disable-tally
157 - --disable-tally2
158 - --disable-doc
159 - --disable-regenerate-docu
160 - --disable-Werror
161 - $(use_enable audit)
162 - $(use_enable berkdb db)
163 - $(use_enable debug)
164 - $(use_enable nis)
165 - $(use_enable pie)
166 - $(use_enable selinux)
167 - $(use_enable static-libs static)
168 - --enable-isadir='.' #464016
169 - )
170 - ECONF_SOURCE="${S}" econf "${myconf[@]}"
171 -}
172 -
173 -multilib_src_compile() {
174 - emake sepermitlockdir="${EPREFIX}/run/sepermit"
175 -}
176 -
177 -multilib_src_install() {
178 - emake DESTDIR="${D}" install \
179 - sepermitlockdir="${EPREFIX}/run/sepermit"
180 -
181 - gen_usr_ldscript -a pam pam_misc pamc
182 -}
183 -
184 -multilib_src_install_all() {
185 - find "${ED}" -type f -name '*.la' -delete || die
186 -
187 - # tmpfiles.eclass is impossible to use because
188 - # there is the pam -> tmpfiles -> systemd -> pam dependency loop
189 -
190 - dodir /usr/lib/tmpfiles.d
191 -
192 - cat ->> "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_
193 - d /run/faillock 0755 root root
194 - _EOF_
195 - use selinux && cat ->> "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-selinux.conf <<-_EOF_
196 - d /run/sepermit 0755 root root
197 - _EOF_
198 -
199 - for i in "${WORKDIR}"/${P}-doc/*; do
200 - doman ${i}
201 - done
202 -}
203 -
204 -pkg_postinst() {
205 - ewarn "Some software with pre-loaded PAM libraries might experience"
206 - ewarn "warnings or failures related to missing symbols and/or versions"
207 - ewarn "after any update. While unfortunate this is a limit of the"
208 - ewarn "implementation of PAM and the software, and it requires you to"
209 - ewarn "restart the software manually after the update."
210 - ewarn ""
211 - ewarn "You can get a list of such software running a command like"
212 - ewarn " lsof / | egrep -i 'del.*libpam\\.so'"
213 - ewarn ""
214 - ewarn "Alternatively, simply reboot your system."
215 -
216 - # The pam_unix module needs to check the password of the user which requires
217 - # read access to /etc/shadow only.
218 - fcaps cap_dac_override sbin/unix_chkpwd
219 -}