1 |
eras 11/11/30 15:49:28 |
2 |
|
3 |
Modified: ChangeLog metadata.xml |
4 |
Added: cyrus-sasl-2.1.25.ebuild |
5 |
Log: |
6 |
Version bump. Add ldapdb USE flag - bug #320893 |
7 |
|
8 |
(Portage version: 2.1.10.39/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.233 dev-libs/cyrus-sasl/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog?rev=1.233&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog?rev=1.233&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog?r1=1.232&r2=1.233 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v |
20 |
retrieving revision 1.232 |
21 |
retrieving revision 1.233 |
22 |
diff -u -r1.232 -r1.233 |
23 |
--- ChangeLog 6 Nov 2011 20:44:41 -0000 1.232 |
24 |
+++ ChangeLog 30 Nov 2011 15:49:28 -0000 1.233 |
25 |
@@ -1,6 +1,20 @@ |
26 |
# ChangeLog for dev-libs/cyrus-sasl |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.232 2011/11/06 20:44:41 eras Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.233 2011/11/30 15:49:28 eras Exp $ |
30 |
+ |
31 |
+*cyrus-sasl-2.1.25 (30 Nov 2011) |
32 |
+ |
33 |
+ 30 Nov 2011; Eray Aslan <eras@g.o> +cyrus-sasl-2.1.25.ebuild, |
34 |
+ +files/cyrus-sasl-2.1.25-as_needed.patch, |
35 |
+ +files/cyrus-sasl-2.1.25-autotools_fixes.patch, |
36 |
+ +files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch, |
37 |
+ +files/cyrus-sasl-2.1.25-fix_heimdal.patch, |
38 |
+ +files/cyrus-sasl-2.1.25-gssapi.patch, |
39 |
+ +files/cyrus-sasl-2.1.25-lib_before_plugin.patch, |
40 |
+ +files/cyrus-sasl-2.1.25-missing_header.patch, |
41 |
+ +files/cyrus-sasl-2.1.25-saslauthd_libtool.patch, |
42 |
+ +files/cyrus-sasl-2.1.25-sasldb_al.patch: |
43 |
+ Version bump. Add ldapdb USE flag - bug #320893 |
44 |
|
45 |
*cyrus-sasl-2.1.23-r6 (06 Nov 2011) |
46 |
|
47 |
|
48 |
|
49 |
|
50 |
1.5 dev-libs/cyrus-sasl/metadata.xml |
51 |
|
52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/metadata.xml?rev=1.5&view=markup |
53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/metadata.xml?rev=1.5&content-type=text/plain |
54 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/metadata.xml?r1=1.4&r2=1.5 |
55 |
|
56 |
Index: metadata.xml |
57 |
=================================================================== |
58 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/metadata.xml,v |
59 |
retrieving revision 1.4 |
60 |
retrieving revision 1.5 |
61 |
diff -u -r1.4 -r1.5 |
62 |
--- metadata.xml 9 May 2011 06:38:47 -0000 1.4 |
63 |
+++ metadata.xml 30 Nov 2011 15:49:28 -0000 1.5 |
64 |
@@ -3,14 +3,14 @@ |
65 |
<pkgmetadata> |
66 |
<herd>net-mail</herd> |
67 |
<use> |
68 |
- <flag name='authdaemond'>Adds Courier-IMAP authdaemond's unix socket |
69 |
+ <flag name='authdaemond'>Add Courier-IMAP authdaemond unix socket |
70 |
support (<pkg>net-mail/courier-imap</pkg>, <pkg>mail-mta/courier</pkg>) |
71 |
</flag> |
72 |
- <flag name='ntlm_unsupported_patch'>Adds NTLM <pkg>net-fs/samba</pkg> |
73 |
+ <flag name='ntlm_unsupported_patch'>Add NTLM <pkg>net-fs/samba</pkg> |
74 |
NOT supported patch</flag> |
75 |
- <flag name='openldap'>Adds ldap support for saslauthd and enable ldapdb |
76 |
- plugin</flag> |
77 |
- <flag name='sample'>Adds sample client and server</flag> |
78 |
+ <flag name='openldap'>Add ldap support for saslauthd</flag> |
79 |
+ <flag name='ldapdb'>Enable ldapdb plugin</flag> |
80 |
+ <flag name='sample'>Enable sample client and server</flag> |
81 |
<flag name='srp'>Enable SRP authentication</flag> |
82 |
<flag name='urandom'>Use /dev/urandom instead of /dev/random</flag> |
83 |
</use> |
84 |
|
85 |
|
86 |
|
87 |
1.1 dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild |
88 |
|
89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild?rev=1.1&view=markup |
90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild?rev=1.1&content-type=text/plain |
91 |
|
92 |
Index: cyrus-sasl-2.1.25.ebuild |
93 |
=================================================================== |
94 |
# Copyright 1999-2011 Gentoo Foundation |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild,v 1.1 2011/11/30 15:49:28 eras Exp $ |
97 |
|
98 |
EAPI=4 |
99 |
inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use |
100 |
|
101 |
SASLAUTHD_CONF_VER="2.1.21" |
102 |
|
103 |
DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)." |
104 |
HOMEPAGE="http://cyrusimap.web.cmu.edu/" |
105 |
SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz" |
106 |
|
107 |
LICENSE="as-is" |
108 |
SLOT="2" |
109 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
110 |
IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite |
111 |
srp ssl static-libs urandom" |
112 |
|
113 |
DEPEND="authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) |
114 |
berkdb? ( >=sys-libs/db-3.2 ) |
115 |
gdbm? ( >=sys-libs/gdbm-1.8.0 ) |
116 |
kerberos? ( virtual/krb5 ) |
117 |
openldap? ( net-nds/openldap ) |
118 |
mysql? ( virtual/mysql ) |
119 |
pam? ( virtual/pam ) |
120 |
postgres? ( dev-db/postgresql-base ) |
121 |
sqlite? ( dev-db/sqlite:3 ) |
122 |
ssl? ( dev-libs/openssl ) |
123 |
java? ( >=virtual/jdk-1.4 )" |
124 |
RDEPEND="${DEPEND}" |
125 |
|
126 |
pkg_setup() { |
127 |
java-pkg-opt-2_pkg_setup |
128 |
} |
129 |
|
130 |
src_prepare() { |
131 |
epatch "${FILESDIR}"/${P}-sasldb_al.patch |
132 |
epatch "${FILESDIR}"/${P}-saslauthd_libtool.patch |
133 |
epatch "${FILESDIR}"/${P}-avoid_pic_overwrite.patch |
134 |
epatch "${FILESDIR}"/${P}-autotools_fixes.patch |
135 |
epatch "${FILESDIR}"/${P}-as_needed.patch |
136 |
epatch "${FILESDIR}"/${P}-missing_header.patch |
137 |
epatch "${FILESDIR}"/${P}-gssapi.patch |
138 |
epatch "${FILESDIR}"/${P}-lib_before_plugin.patch |
139 |
epatch "${FILESDIR}"/${P}-fix_heimdal.patch |
140 |
epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch |
141 |
epatch "${FILESDIR}"/${PN}-2.1.23+db-5.0.patch |
142 |
# epatch "${FILESDIR}"/${P}-fix_dovecot_authentication.patch |
143 |
|
144 |
# Use plugindir for sasldir |
145 |
sed -i '/^sasldir =/s:=.*:= $(plugindir):' \ |
146 |
"${S}"/plugins/Makefile.{am,in} || die "sed failed" |
147 |
|
148 |
AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf |
149 |
} |
150 |
|
151 |
src_configure() { |
152 |
append-flags -fno-strict-aliasing |
153 |
append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED |
154 |
|
155 |
# Java support. |
156 |
use java && export JAVAC="${JAVAC} ${JAVACFLAGS}" |
157 |
|
158 |
local myconf |
159 |
|
160 |
# Add authdaemond support (bug #56523). |
161 |
if use authdaemond ; then |
162 |
myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket" |
163 |
fi |
164 |
|
165 |
# Fix for bug #59634. |
166 |
if ! use ssl ; then |
167 |
myconf="${myconf} --without-des" |
168 |
fi |
169 |
|
170 |
if use mysql || use postgres ; then |
171 |
myconf="${myconf} --enable-sql" |
172 |
else |
173 |
myconf="${myconf} --disable-sql" |
174 |
fi |
175 |
|
176 |
# Default to GDBM if both 'gdbm' and 'berkdb' are present. |
177 |
if use gdbm ; then |
178 |
einfo "Building with GNU DB as database backend for your SASLdb" |
179 |
myconf="${myconf} --with-dblib=gdbm" |
180 |
elif use berkdb ; then |
181 |
einfo "Building with BerkeleyDB as database backend for your SASLdb" |
182 |
myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)" |
183 |
else |
184 |
einfo "Building without SASLdb support" |
185 |
myconf="${myconf} --with-dblib=none" |
186 |
fi |
187 |
|
188 |
# Use /dev/urandom instead of /dev/random (bug #46038). |
189 |
if use urandom ; then |
190 |
myconf="${myconf} --with-devrandom=/dev/urandom" |
191 |
fi |
192 |
|
193 |
econf \ |
194 |
--enable-login \ |
195 |
--enable-ntlm \ |
196 |
--enable-auth-sasldb \ |
197 |
--disable-cmulocal \ |
198 |
--disable-krb4 \ |
199 |
--enable-otp \ |
200 |
--without-sqlite \ |
201 |
--with-saslauthd=/var/lib/sasl2 \ |
202 |
--with-pwcheck=/var/lib/sasl2 \ |
203 |
--with-configdir=/etc/sasl2 \ |
204 |
--with-plugindir=/usr/$(get_libdir)/sasl2 \ |
205 |
--with-dbpath=/etc/sasl2/sasldb2 \ |
206 |
$(use_with ssl openssl) \ |
207 |
$(use_with pam) \ |
208 |
$(use_with openldap ldap) \ |
209 |
$(use_enable ldapdb) \ |
210 |
$(use_enable sample) \ |
211 |
$(use_enable kerberos gssapi) \ |
212 |
$(use_enable java) \ |
213 |
$(use_with java javahome ${JAVA_HOME}) \ |
214 |
$(use_with mysql) \ |
215 |
$(use_with postgres pgsql) \ |
216 |
$(use_with sqlite sqlite3 /usr/$(get_libdir)) \ |
217 |
$(use_enable srp) \ |
218 |
$(use_enable static-libs static) \ |
219 |
${myconf} |
220 |
} |
221 |
|
222 |
src_compile() { |
223 |
emake |
224 |
|
225 |
# Default location for java classes breaks OpenOffice (bug #60769). |
226 |
# Thanks to axxo@g.o for the solution. |
227 |
cd "${S}" |
228 |
if use java ; then |
229 |
jar -cvf ${PN}.jar -C java $(find java -name "*.class") |
230 |
fi |
231 |
|
232 |
# Add testsaslauthd (bug #58768). |
233 |
cd "${S}/saslauthd" |
234 |
emake testsaslauthd |
235 |
} |
236 |
|
237 |
src_install() { |
238 |
emake DESTDIR="${D}" install |
239 |
keepdir /var/lib/sasl2 /etc/sasl2 |
240 |
|
241 |
if use sample ; then |
242 |
docinto sample |
243 |
dodoc sample/*.c |
244 |
exeinto /usr/share/doc/${P}/sample |
245 |
doexe sample/client sample/server |
246 |
fi |
247 |
|
248 |
# Default location for java classes breaks OpenOffice (bug #60769). |
249 |
if use java ; then |
250 |
java-pkg_dojar ${PN}.jar |
251 |
java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so" |
252 |
# hackish, don't wanna dig through makefile |
253 |
rm -Rf "${D}/usr/$(get_libdir)/java" |
254 |
docinto "java" |
255 |
dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/* |
256 |
dodir "/usr/share/doc/${PF}/java/Test" |
257 |
insinto "/usr/share/doc/${PF}/java/Test" |
258 |
doins "${S}"/java/Test/*.java |
259 |
fi |
260 |
|
261 |
docinto "" |
262 |
dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt |
263 |
newdoc pwcheck/README README.pwcheck |
264 |
dohtml doc/*.html |
265 |
|
266 |
docinto "saslauthd" |
267 |
dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README} |
268 |
|
269 |
newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd |
270 |
|
271 |
newinitd "${FILESDIR}/pwcheck.rc6" pwcheck |
272 |
|
273 |
newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd |
274 |
newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd |
275 |
|
276 |
newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd |
277 |
|
278 |
use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete |
279 |
} |
280 |
|
281 |
pkg_postinst () { |
282 |
# Generate an empty sasldb2 with correct permissions. |
283 |
if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then |
284 |
einfo "Generating an empty sasldb2 with correct permissions ..." |
285 |
echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \ |
286 |
|| die "Failed to generate sasldb2" |
287 |
"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \ |
288 |
|| die "Failed to delete temp user" |
289 |
chown root:mail "${ROOT}/etc/sasl2/sasldb2" \ |
290 |
|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2" |
291 |
chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \ |
292 |
|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2" |
293 |
fi |
294 |
|
295 |
if use authdaemond ; then |
296 |
elog "You need to add a user running a service using Courier's" |
297 |
elog "authdaemon to the 'mail' group. For example, do:" |
298 |
elog " gpasswd -a postfix mail" |
299 |
elog "to add the 'postfix' user to the 'mail' group." |
300 |
fi |
301 |
} |