1 |
flameeyes 09/10/07 19:59:56 |
2 |
|
3 |
Modified: pam_userdb-0.99.8.1.ebuild ChangeLog |
4 |
Added: pam_userdb-1.1.0.ebuild |
5 |
Log: |
6 |
Bump to latest Linux-PAM version, use a newer Berkeley DB version, move to EAPI=1 and make sure dependencies are satisfied only by the correct slot of berkdb. Thanks to Michael Orlitzky in bug #287298. |
7 |
(Portage version: 2.2_rc44/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.6 sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild?rev=1.6&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild?rev=1.6&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild?r1=1.5&r2=1.6 |
15 |
|
16 |
Index: pam_userdb-0.99.8.1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild,v |
19 |
retrieving revision 1.5 |
20 |
retrieving revision 1.6 |
21 |
diff -u -r1.5 -r1.6 |
22 |
--- pam_userdb-0.99.8.1.ebuild 26 Nov 2008 22:10:26 -0000 1.5 |
23 |
+++ pam_userdb-0.99.8.1.ebuild 7 Oct 2009 19:59:55 -0000 1.6 |
24 |
@@ -1,8 +1,10 @@ |
25 |
-# Copyright 1999-2008 Gentoo Foundation |
26 |
+# Copyright 1999-2009 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild,v 1.5 2008/11/26 22:10:26 flameeyes Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild,v 1.6 2009/10/07 19:59:55 flameeyes Exp $ |
30 |
|
31 |
-inherit libtool multilib eutils pam toolchain-funcs flag-o-matic |
32 |
+EAPI=1 |
33 |
+ |
34 |
+inherit libtool multilib eutils pam toolchain-funcs flag-o-matic versionator |
35 |
|
36 |
# BDB is internalized to get a non-threaded lib for pam_userdb.so to |
37 |
# be built with. The runtime-only dependency on BDB suggests the user |
38 |
@@ -28,7 +30,7 @@ |
39 |
DEPEND="${RDEPEND} |
40 |
nls? ( sys-devel/gettext )" |
41 |
RDEPEND="${RDEPEND} |
42 |
- >=sys-libs/db-${BDB_VER}" |
43 |
+ >=sys-libs/db-${BDB_VER}:$(get_version_component_range 1-2 ${BDB_VER})" |
44 |
|
45 |
S="${WORKDIR}/${MY_P}" |
46 |
|
47 |
|
48 |
|
49 |
|
50 |
1.18 sys-auth/pam_userdb/ChangeLog |
51 |
|
52 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/pam_userdb/ChangeLog?rev=1.18&view=markup |
53 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/pam_userdb/ChangeLog?rev=1.18&content-type=text/plain |
54 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/pam_userdb/ChangeLog?r1=1.17&r2=1.18 |
55 |
|
56 |
Index: ChangeLog |
57 |
=================================================================== |
58 |
RCS file: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/ChangeLog,v |
59 |
retrieving revision 1.17 |
60 |
retrieving revision 1.18 |
61 |
diff -u -r1.17 -r1.18 |
62 |
--- ChangeLog 26 Nov 2008 22:10:26 -0000 1.17 |
63 |
+++ ChangeLog 7 Oct 2009 19:59:55 -0000 1.18 |
64 |
@@ -1,6 +1,14 @@ |
65 |
# ChangeLog for sys-auth/pam_userdb |
66 |
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
67 |
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/ChangeLog,v 1.17 2008/11/26 22:10:26 flameeyes Exp $ |
68 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
69 |
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/ChangeLog,v 1.18 2009/10/07 19:59:55 flameeyes Exp $ |
70 |
+ |
71 |
+*pam_userdb-1.1.0 (07 Oct 2009) |
72 |
+ |
73 |
+ 07 Oct 2009; Diego E. Pettenò <flameeyes@g.o> |
74 |
+ pam_userdb-0.99.8.1.ebuild, +pam_userdb-1.1.0.ebuild: |
75 |
+ Bump to latest Linux-PAM version, use a newer Berkeley DB version, move to |
76 |
+ EAPI=1 and make sure dependencies are satisfied only by the correct slot |
77 |
+ of berkdb. Thanks to Michael Orlitzky in bug #287298. |
78 |
|
79 |
26 Nov 2008; Diego E. Pettenò <flameeyes@g.o> |
80 |
pam_userdb-0.99.8.1.ebuild: |
81 |
|
82 |
|
83 |
|
84 |
1.1 sys-auth/pam_userdb/pam_userdb-1.1.0.ebuild |
85 |
|
86 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/pam_userdb/pam_userdb-1.1.0.ebuild?rev=1.1&view=markup |
87 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/pam_userdb/pam_userdb-1.1.0.ebuild?rev=1.1&content-type=text/plain |
88 |
|
89 |
Index: pam_userdb-1.1.0.ebuild |
90 |
=================================================================== |
91 |
# Copyright 1999-2009 Gentoo Foundation |
92 |
# Distributed under the terms of the GNU General Public License v2 |
93 |
# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/pam_userdb-1.1.0.ebuild,v 1.1 2009/10/07 19:59:55 flameeyes Exp $ |
94 |
|
95 |
EAPI=1 |
96 |
|
97 |
inherit libtool multilib eutils pam toolchain-funcs flag-o-matic versionator |
98 |
|
99 |
# BDB is internalized to get a non-threaded lib for pam_userdb.so to |
100 |
# be built with. The runtime-only dependency on BDB suggests the user |
101 |
# will use the system-installed db_load to create pam_userdb databases. |
102 |
BDB_VER="4.6.21" |
103 |
|
104 |
MY_P="Linux-PAM-${PV}" |
105 |
|
106 |
HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/" |
107 |
DESCRIPTION="Linux-PAM pam_userdb (Berkeley DB) module" |
108 |
|
109 |
SRC_URI="mirror://kernel/linux/libs/pam/pre/library/${MY_P}.tar.bz2 |
110 |
http://downloads.sleepycat.com/db-${BDB_VER}.tar.gz" |
111 |
|
112 |
LICENSE="PAM" |
113 |
SLOT="0" |
114 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
115 |
IUSE="nls elibc_FreeBSD" |
116 |
|
117 |
RDEPEND="nls? ( virtual/libintl ) |
118 |
!<sys-libs/pam-0.99 |
119 |
>=sys-libs/pam-1.1.0" |
120 |
DEPEND="${RDEPEND} |
121 |
nls? ( sys-devel/gettext )" |
122 |
RDEPEND="${RDEPEND} |
123 |
>=sys-libs/db-${BDB_VER}:$(get_version_component_range 1-2 ${BDB_VER})" |
124 |
|
125 |
S="${WORKDIR}/${MY_P}" |
126 |
|
127 |
src_unpack() { |
128 |
unpack ${A} |
129 |
|
130 |
elibtoolize |
131 |
} |
132 |
|
133 |
src_compile() { |
134 |
local myconf |
135 |
|
136 |
if use hppa || use elibc_FreeBSD; then |
137 |
myconf="${myconf} --disable-pie" |
138 |
fi |
139 |
|
140 |
local BDB_DIR="${WORKDIR}/db-${BDB_VER}" |
141 |
|
142 |
# BDB is internalized to get a non-threaded lib for pam_userdb.so to |
143 |
# be built with. To demand-load a shared library which uses threads |
144 |
# into an application which doesn't is a Very Bad Idea! |
145 |
einfo "Building Berkley DB ${BDB_VER}..." |
146 |
cd "${BDB_DIR}/build_unix" || die |
147 |
|
148 |
CFLAGS="${CFLAGS} -fPIC" \ |
149 |
ECONF_SOURCE="../dist" \ |
150 |
econf \ |
151 |
--disable-compat185 \ |
152 |
--disable-cxx \ |
153 |
--disable-diagnostic \ |
154 |
--disable-dump185 \ |
155 |
--disable-java \ |
156 |
--disable-rpc \ |
157 |
--disable-tcl \ |
158 |
--disable-shared \ |
159 |
--disable-o_direct \ |
160 |
--with-pic \ |
161 |
--with-uniquename="_pam" \ |
162 |
--with-mutex="UNIX/fcntl" \ |
163 |
--prefix="${S}/modules/pam_userdb" \ |
164 |
--includedir="${S}/modules/pam_userdb" \ |
165 |
--libdir="${S}/modules/pam_userdb" || die "Bad BDB ./configure" |
166 |
|
167 |
emake CC="$(tc-getCC)" || die "BDB build failed" |
168 |
emake install || die |
169 |
|
170 |
# We link against libdb_pam (*-dbpam.patch), else stupid libtool goes |
171 |
# and relinks it during install to libdb in /usr/lib |
172 |
cp -f "${S}"/modules/pam_userdb/libdb{,_pam}.a |
173 |
|
174 |
# Make sure out static libs are used |
175 |
append-flags -I"{S}/modules/pam_userdb" |
176 |
append-ldflags -L"${S}/modules/pam_userdb" |
177 |
|
178 |
cd "${S}" |
179 |
econf \ |
180 |
$(use_enable nls) \ |
181 |
--enable-db \ |
182 |
--enable-securedir=/$(get_libdir)/security \ |
183 |
--enable-isadir=/$(get_libdir)/security \ |
184 |
--disable-dependency-tracking \ |
185 |
--disable-prelude \ |
186 |
--with-db-uniquename=_pam \ |
187 |
${myconf} || die "econf failed" |
188 |
|
189 |
emake -C modules/pam_userdb || die "emake failed" |
190 |
} |
191 |
|
192 |
src_install() { |
193 |
emake -C modules/pam_userdb DESTDIR="${D}" install || die "make install failed" |
194 |
|
195 |
dodoc "${S}/modules/pam_userdb/README" |
196 |
|
197 |
# No, we don't really need .la files for PAM modules. |
198 |
rm -f "${D}/$(get_libdir)/security/"*.la |
199 |
} |
200 |
|
201 |
pkg_postinst() { |
202 |
elog "Since ${CATEGORY}/${PN}-1.1.0 the internal Berkeley DB version" |
203 |
elog "used is ${BDB_VER}; if you're updating from an older version" |
204 |
elog "you will have to dump and re-load the user database." |
205 |
} |