1 |
commit: d93d6915d08488295261b18abfd0485f24642488 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 2 08:10:38 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 2 08:22:42 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d93d6915 |
7 |
|
8 |
dev-libs/cyrus-sasl: Added GitHub SRC_URI. Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild | 4 +- |
14 |
dev-libs/cyrus-sasl/cyrus-sasl-2.1.27.ebuild | 251 ------------------------ |
15 |
2 files changed, 2 insertions(+), 253 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild |
18 |
index ee2789f0acc..32fab23b4b5 100644 |
19 |
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild |
20 |
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild |
21 |
@@ -9,7 +9,8 @@ SASLAUTHD_CONF_VER="2.1.26" |
22 |
|
23 |
DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)" |
24 |
HOMEPAGE="https://www.cyrusimap.org/sasl/" |
25 |
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz" |
26 |
+#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz" |
27 |
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" |
28 |
|
29 |
LICENSE="BSD-with-attribution" |
30 |
SLOT="2" |
31 |
@@ -195,7 +196,6 @@ multilib_src_install() { |
32 |
} |
33 |
|
34 |
multilib_src_install_all() { |
35 |
- |
36 |
doman man/* |
37 |
|
38 |
keepdir /etc/sasl2 |
39 |
|
40 |
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27.ebuild |
41 |
deleted file mode 100644 |
42 |
index 1ab001b0bf0..00000000000 |
43 |
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27.ebuild |
44 |
+++ /dev/null |
45 |
@@ -1,251 +0,0 @@ |
46 |
-# Copyright 1999-2019 Gentoo Authors |
47 |
-# Distributed under the terms of the GNU General Public License v2 |
48 |
- |
49 |
-EAPI=6 |
50 |
- |
51 |
-inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd eapi7-ver |
52 |
- |
53 |
-SASLAUTHD_CONF_VER="2.1.26" |
54 |
- |
55 |
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)" |
56 |
-HOMEPAGE="https://www.cyrusimap.org/sasl/" |
57 |
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" |
58 |
- |
59 |
-LICENSE="BSD-with-attribution" |
60 |
-SLOT="2" |
61 |
-KEYWORDS="~amd64 ~x86" |
62 |
-IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" |
63 |
- |
64 |
-CDEPEND=" |
65 |
- net-mail/mailbase |
66 |
- authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) |
67 |
- berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] ) |
68 |
- gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] ) |
69 |
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
70 |
- openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) |
71 |
- mysql? ( virtual/mysql ) |
72 |
- pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] ) |
73 |
- postgres? ( dev-db/postgresql:* ) |
74 |
- sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] ) |
75 |
- ssl? ( |
76 |
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) |
77 |
- libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) |
78 |
- ) |
79 |
- java? ( >=virtual/jdk-1.6:= )" |
80 |
- |
81 |
-RDEPEND=" |
82 |
- ${CDEPEND} |
83 |
- selinux? ( sec-policy/selinux-sasl )" |
84 |
- |
85 |
-DEPEND="${CDEPEND} |
86 |
- dev-perl/Pod-POM-View-Restructured |
87 |
- dev-python/sphinx" |
88 |
- |
89 |
-MULTILIB_WRAPPED_HEADERS=( |
90 |
- /usr/include/sasl/md5global.h |
91 |
-) |
92 |
- |
93 |
-PATCHES=( |
94 |
- "${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch" |
95 |
- "${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch" |
96 |
- "${FILESDIR}/${PN}-2.1.27-as_needed.patch" |
97 |
- "${FILESDIR}/${PN}-2.1.25-auxprop.patch" |
98 |
- "${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch" |
99 |
- "${FILESDIR}/${PN}-2.1.26-missing-size_t.patch" |
100 |
- "${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch" |
101 |
-) |
102 |
- |
103 |
-pkg_setup() { |
104 |
- java-pkg-opt-2_pkg_setup |
105 |
-} |
106 |
- |
107 |
-src_prepare() { |
108 |
- default |
109 |
- |
110 |
- # Get rid of the -R switch (runpath_switch for Sun) |
111 |
- # >=gcc-4.6 errors out with unknown option |
112 |
- sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \ |
113 |
- configure.ac || die |
114 |
- |
115 |
- # Use plugindir for sasldir |
116 |
- sed -i '/^sasldir =/s:=.*:= $(plugindir):' \ |
117 |
- "${S}"/plugins/Makefile.{am,in} || die "sed failed" |
118 |
- |
119 |
- # #486740 #468556 |
120 |
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \ |
121 |
- -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \ |
122 |
- configure.ac || die |
123 |
- |
124 |
- eautoreconf |
125 |
-} |
126 |
- |
127 |
-src_configure() { |
128 |
- append-flags -fno-strict-aliasing |
129 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
130 |
- # getpassphrase is defined in /usr/include/stdlib.h |
131 |
- append-cppflags -DHAVE_GETPASSPHRASE |
132 |
- else |
133 |
- # this horrendously breaks things on Solaris |
134 |
- append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED |
135 |
- fi |
136 |
- |
137 |
- multilib-minimal_src_configure |
138 |
-} |
139 |
- |
140 |
-multilib_src_configure() { |
141 |
- # Java support. |
142 |
- multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}" |
143 |
- |
144 |
- local myeconfargs=( |
145 |
- --enable-login |
146 |
- --enable-ntlm |
147 |
- --enable-auth-sasldb |
148 |
- --disable-cmulocal |
149 |
- --disable-krb4 |
150 |
- --disable-macos-framework |
151 |
- --enable-otp |
152 |
- --without-sqlite |
153 |
- --with-saslauthd="${EPREFIX}"/run/saslauthd |
154 |
- --with-pwcheck="${EPREFIX}"/run/saslauthd |
155 |
- --with-configdir="${EPREFIX}"/etc/sasl2 |
156 |
- --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2 |
157 |
- --with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2 |
158 |
- $(use_with ssl openssl) |
159 |
- $(use_with pam) |
160 |
- $(use_with openldap ldap) |
161 |
- $(use_enable ldapdb) |
162 |
- $(multilib_native_use_enable sample) |
163 |
- $(use_enable kerberos gssapi) |
164 |
- $(multilib_native_use_enable java) |
165 |
- $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr) |
166 |
- $(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql) |
167 |
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir)) |
168 |
- $(use_enable srp) |
169 |
- $(use_enable static-libs static) |
170 |
- |
171 |
- # Add authdaemond support (bug #56523). |
172 |
- $(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '') |
173 |
- |
174 |
- # Fix for bug #59634. |
175 |
- $(usex ssl '' --without-des) |
176 |
- |
177 |
- # Use /dev/urandom instead of /dev/random (bug #46038). |
178 |
- $(usex urandom --with-devrandom=/dev/urandom '') |
179 |
- ) |
180 |
- |
181 |
- if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then |
182 |
- myeconfargs+=( --enable-sql ) |
183 |
- else |
184 |
- myeconfargs+=( --disable-sql ) |
185 |
- fi |
186 |
- |
187 |
- # Default to GDBM if both 'gdbm' and 'berkdb' are present. |
188 |
- if use gdbm ; then |
189 |
- einfo "Building with GNU DB as database backend for your SASLdb" |
190 |
- myeconfargs+=( --with-dblib=gdbm ) |
191 |
- elif use berkdb ; then |
192 |
- einfo "Building with BerkeleyDB as database backend for your SASLdb" |
193 |
- myeconfargs+=( |
194 |
- --with-dblib=berkeley |
195 |
- --with-bdb-incdir="$(db_includedir)" |
196 |
- ) |
197 |
- else |
198 |
- einfo "Building without SASLdb support" |
199 |
- myeconfargs+=( --with-dblib=none ) |
200 |
- fi |
201 |
- |
202 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
203 |
-} |
204 |
- |
205 |
-multilib_src_compile() { |
206 |
- emake |
207 |
- |
208 |
- # Default location for java classes breaks OpenOffice (bug #60769). |
209 |
- # Thanks to axxo@g.o for the solution. |
210 |
- if multilib_is_native_abi && use java ; then |
211 |
- jar -cvf ${PN}.jar -C java $(find java -name "*.class") |
212 |
- fi |
213 |
-} |
214 |
- |
215 |
-multilib_src_install() { |
216 |
- default |
217 |
- |
218 |
- if multilib_is_native_abi; then |
219 |
- if use sample ; then |
220 |
- docinto sample |
221 |
- dodoc "${S}"/sample/*.c |
222 |
- exeinto /usr/share/doc/${P}/sample |
223 |
- doexe sample/client sample/server |
224 |
- fi |
225 |
- |
226 |
- # Default location for java classes breaks OpenOffice (bug #60769). |
227 |
- if use java; then |
228 |
- java-pkg_dojar ${PN}.jar |
229 |
- java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)" |
230 |
- # hackish, don't wanna dig through makefile |
231 |
- rm -rf "${ED}/usr/$(get_libdir)/java" || die |
232 |
- docinto "java" |
233 |
- dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/* |
234 |
- dodir "/usr/share/doc/${PF}/java/Test" |
235 |
- insinto "/usr/share/doc/${PF}/java/Test" |
236 |
- doins "${S}"/java/Test/*.java |
237 |
- fi |
238 |
- |
239 |
- dosbin saslauthd/testsaslauthd |
240 |
- fi |
241 |
-} |
242 |
- |
243 |
-multilib_src_install_all() { |
244 |
- keepdir /etc/sasl2 |
245 |
- |
246 |
- dodoc AUTHORS ChangeLog doc/legacy/TODO |
247 |
- newdoc pwcheck/README README.pwcheck |
248 |
- |
249 |
- newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes |
250 |
- edos2unix ${ED%/}/usr/share/doc/${PF}/release-notes |
251 |
- |
252 |
- docinto html |
253 |
- dodoc doc/html/*.html |
254 |
- |
255 |
- newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd |
256 |
- |
257 |
- newinitd "${FILESDIR}/pwcheck.rc6" pwcheck |
258 |
- systemd_dounit "${FILESDIR}/pwcheck.service" |
259 |
- |
260 |
- newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd |
261 |
- newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd |
262 |
- systemd_dounit "${FILESDIR}/saslauthd.service" |
263 |
- systemd_dotmpfilesd "${FILESDIR}/${PN}.conf" |
264 |
- |
265 |
- # The get_modname bit is important: do not remove the .la files on |
266 |
- # platforms where the lib isn't called .so for cyrus searches the .la to |
267 |
- # figure out what the name is supposed to be instead |
268 |
- if ! use static-libs && [[ $(get_modname) == .so ]] ; then |
269 |
- find "${ED}" -name "*.la" -delete || die |
270 |
- fi |
271 |
-} |
272 |
- |
273 |
-pkg_postinst () { |
274 |
- # Generate an empty sasldb2 with correct permissions. |
275 |
- if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then |
276 |
- einfo "Generating an empty sasldb2 with correct permissions ..." |
277 |
- echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \ |
278 |
- || die "Failed to generate sasldb2" |
279 |
- "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \ |
280 |
- || die "Failed to delete temp user" |
281 |
- chown root:mail "${EROOT}/etc/sasl2/sasldb2" \ |
282 |
- || die "Failed to chown ${EROOT}/etc/sasl2/sasldb2" |
283 |
- chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \ |
284 |
- || die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2" |
285 |
- fi |
286 |
- |
287 |
- if use authdaemond ; then |
288 |
- elog "You need to add a user running a service using Courier's" |
289 |
- elog "authdaemon to the 'mail' group. For example, do:" |
290 |
- elog " gpasswd -a postfix mail" |
291 |
- elog "to add the 'postfix' user to the 'mail' group." |
292 |
- fi |
293 |
- |
294 |
- elog "pwcheck and saslauthd home directories have moved to:" |
295 |
- elog " /run/saslauthd, using tmpfiles.d" |
296 |
-} |