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