1 |
flameeyes 13/02/28 05:59:27 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: pam-1.1.6-r4.ebuild |
5 |
Removed: pam-1.1.6-r3.ebuild |
6 |
Log: |
7 |
Fix build on non-multilib systems, should close bug #459536. |
8 |
|
9 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342) |
10 |
|
11 |
Revision Changes Path |
12 |
1.328 sys-libs/pam/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/pam/ChangeLog?rev=1.328&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/pam/ChangeLog?rev=1.328&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/pam/ChangeLog?r1=1.327&r2=1.328 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v |
21 |
retrieving revision 1.327 |
22 |
retrieving revision 1.328 |
23 |
diff -u -r1.327 -r1.328 |
24 |
--- ChangeLog 27 Feb 2013 11:08:52 -0000 1.327 |
25 |
+++ ChangeLog 28 Feb 2013 05:59:27 -0000 1.328 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for sys-libs/pam |
28 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.327 2013/02/27 11:08:52 flameeyes Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.328 2013/02/28 05:59:27 flameeyes Exp $ |
31 |
+ |
32 |
+*pam-1.1.6-r4 (28 Feb 2013) |
33 |
+ |
34 |
+ 28 Feb 2013; Diego E. Pettenò <flameeyes@g.o> +pam-1.1.6-r4.ebuild, |
35 |
+ -pam-1.1.6-r3.ebuild: |
36 |
+ Fix build on non-multilib systems, should close bug #459536. |
37 |
|
38 |
*pam-1.1.6-r3 (27 Feb 2013) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 sys-libs/pam/pam-1.1.6-r4.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/pam/pam-1.1.6-r4.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/pam/pam-1.1.6-r4.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: pam-1.1.6-r4.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2013 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.6-r4.ebuild,v 1.1 2013/02/28 05:59:27 flameeyes Exp $ |
53 |
|
54 |
EAPI=5 |
55 |
|
56 |
inherit libtool multilib eutils pam toolchain-funcs flag-o-matic db-use autotools autotools-utils |
57 |
|
58 |
MY_PN="Linux-PAM" |
59 |
MY_P="${MY_PN}-${PV}" |
60 |
|
61 |
HOMEPAGE="https://fedorahosted.org/linux-pam/" |
62 |
DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)" |
63 |
|
64 |
SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2 |
65 |
http://www.linux-pam.org/documentation/${MY_P}-docs.tar.bz2" |
66 |
|
67 |
LICENSE="|| ( BSD GPL-2 )" |
68 |
SLOT="0" |
69 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" |
70 |
IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb nis" |
71 |
|
72 |
RDEPEND="nls? ( virtual/libintl ) |
73 |
cracklib? ( >=sys-libs/cracklib-2.8.3 ) |
74 |
audit? ( sys-process/audit ) |
75 |
selinux? ( >=sys-libs/libselinux-1.28 ) |
76 |
berkdb? ( sys-libs/db ) |
77 |
elibc_glibc? ( |
78 |
>=sys-libs/glibc-2.7 |
79 |
nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) |
80 |
)" |
81 |
DEPEND="${RDEPEND} |
82 |
>=sys-devel/libtool-2 |
83 |
sys-devel/flex |
84 |
nls? ( sys-devel/gettext ) |
85 |
virtual/pkgconfig" |
86 |
PDEPEND="sys-auth/pambase |
87 |
vim-syntax? ( app-vim/pam-syntax )" |
88 |
RDEPEND="${RDEPEND} |
89 |
!<sys-apps/openrc-0.11.8 |
90 |
!sys-auth/openpam |
91 |
!sys-auth/pam_userdb" |
92 |
|
93 |
S="${WORKDIR}/${MY_P}" |
94 |
|
95 |
check_old_modules() { |
96 |
local retval="0" |
97 |
|
98 |
if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then |
99 |
eerror "" |
100 |
eerror "Your current setup is using the pam_stack module." |
101 |
eerror "This module is deprecated and no longer supported, and since version" |
102 |
eerror "0.99 is no longer installed, nor provided by any other package." |
103 |
eerror "The package will be built (to allow binary package builds), but will" |
104 |
eerror "not be installed." |
105 |
eerror "Please replace pam_stack usage with proper include directive usage," |
106 |
eerror "following the PAM Upgrade guide at the following URL" |
107 |
eerror " http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml" |
108 |
eerror "" |
109 |
|
110 |
retval=1 |
111 |
fi |
112 |
|
113 |
if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; then |
114 |
eerror "" |
115 |
eerror "Your current setup is using one or more of the following modules," |
116 |
eerror "that are not built or supported anymore:" |
117 |
eerror "pam_pwdb, pam_console" |
118 |
eerror "If you are in real need for these modules, please contact the maintainers" |
119 |
eerror "of PAM through http://bugs.gentoo.org/ providing information about its" |
120 |
eerror "use cases." |
121 |
eerror "Please also make sure to read the PAM Upgrade guide at the following URL:" |
122 |
eerror " http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml" |
123 |
eerror "" |
124 |
|
125 |
retval=1 |
126 |
fi |
127 |
|
128 |
return $retval |
129 |
} |
130 |
|
131 |
pkg_pretend() { |
132 |
# do not error out, this is just a warning, one could build a binpkg |
133 |
# with old modules enabled. |
134 |
check_old_modules |
135 |
} |
136 |
|
137 |
src_prepare() { |
138 |
epatch "${FILESDIR}"/${MY_P}-destdir.patch |
139 |
epatch "${FILESDIR}"/${MY_P}+glibc-2.16.patch |
140 |
|
141 |
eautoreconf |
142 |
elibtoolize |
143 |
} |
144 |
|
145 |
src_configure() { |
146 |
# Disable automatic detection of libxcrypt; we _don't_ want the |
147 |
# user to link libxcrypt in by default, since we won't track the |
148 |
# dependency and allow to break PAM this way. |
149 |
export ac_cv_header_xcrypt_h=no |
150 |
|
151 |
local myeconfargs=( |
152 |
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
153 |
--libdir="${EPREFIX}"/usr/$(get_libdir) \ |
154 |
--enable-securedir="${EPREFIX}"/$(get_libdir)/security |
155 |
--enable-isadir="${EPREFIX}"/$(get_libdir)/security |
156 |
$(use_enable nls) |
157 |
$(use_enable selinux) |
158 |
$(use_enable cracklib) |
159 |
$(use_enable audit) |
160 |
$(use_enable debug) |
161 |
$(use_enable berkdb db) |
162 |
$(use_enable nis) |
163 |
--with-db-uniquename=-$(db_findver sys-libs/db) |
164 |
--disable-prelude |
165 |
) |
166 |
|
167 |
if use hppa || use elibc_FreeBSD; then |
168 |
myeconfargs+=( --disable-pie ) |
169 |
fi |
170 |
|
171 |
autotools-utils_src_configure |
172 |
} |
173 |
|
174 |
src_compile() { |
175 |
autotools-utils_src_compile sepermitlockdir="${EPREFIX}/run/sepermit" |
176 |
} |
177 |
|
178 |
DOCS=( CHANGELOG ChangeLog README AUTHORS Copyright NEWS ) |
179 |
|
180 |
src_install() { |
181 |
autotools-utils_src_install sepermitlockdir="${EPREFIX}/run/sepermit" |
182 |
|
183 |
# Need to be suid |
184 |
fperms u+s /sbin/unix_chkpwd |
185 |
|
186 |
gen_usr_ldscript -a pam pamc pam_misc |
187 |
|
188 |
# create extra symlinks just in case something depends on them... |
189 |
local lib |
190 |
for lib in pam pamc pam_misc; do |
191 |
if ! [[ -f "${ED}"/$(get_libdir)/lib${lib}$(get_libname) ]]; then |
192 |
dosym lib${lib}$(get_libname 0) /$(get_libdir)/lib${lib}$(get_libname) |
193 |
fi |
194 |
done |
195 |
|
196 |
docinto modules |
197 |
for dir in modules/pam_*; do |
198 |
newdoc "${dir}"/README README."$(basename "${dir}")" |
199 |
done |
200 |
|
201 |
prune_libtool_files --all |
202 |
|
203 |
if use selinux; then |
204 |
dodir /usr/lib/tmpfiles.d |
205 |
cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF |
206 |
d /run/sepermit 0755 root root |
207 |
EOF |
208 |
fi |
209 |
} |
210 |
|
211 |
pkg_preinst() { |
212 |
check_old_modules || die "deprecated PAM modules still used" |
213 |
} |
214 |
|
215 |
pkg_postinst() { |
216 |
ewarn "Some software with pre-loaded PAM libraries might experience" |
217 |
ewarn "warnings or failures related to missing symbols and/or versions" |
218 |
ewarn "after any update. While unfortunate this is a limit of the" |
219 |
ewarn "implementation of PAM and the software, and it requires you to" |
220 |
ewarn "restart the software manually after the update." |
221 |
ewarn "" |
222 |
ewarn "You can get a list of such software running a command like" |
223 |
ewarn " lsof / | egrep -i 'del.*libpam\\.so'" |
224 |
ewarn "" |
225 |
ewarn "Alternatively, simply reboot your system." |
226 |
if [ -x "${ROOT}"/var/log/tallylog ] ; then |
227 |
elog "" |
228 |
elog "Because of a bug present up to version 1.1.1-r2, you have" |
229 |
elog "an executable /var/log/tallylog file. You can safely" |
230 |
elog "correct it by running the command" |
231 |
elog " chmod -x /var/log/tallylog" |
232 |
elog "" |
233 |
fi |
234 |
} |