1 |
commit: 3c9a4aadc606b9c5a55baa847c3cfd6bf353594b |
2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 22 05:44:06 2015 +0000 |
4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 22 05:44:06 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9a4aad |
7 |
|
8 |
mail-filter/maildrop: version bump. do not setuid unnecessarily |
9 |
|
10 |
Gentoo-Bug: 560678 |
11 |
|
12 |
mail-filter/maildrop/Manifest | 1 + |
13 |
.../maildrop/files/maildrop-testsuite-r2.patch | 65 +++++++++ |
14 |
mail-filter/maildrop/maildrop-2.8.3.ebuild | 145 +++++++++++++++++++++ |
15 |
mail-filter/maildrop/metadata.xml | 1 + |
16 |
4 files changed, 212 insertions(+) |
17 |
|
18 |
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest |
19 |
index 35a7797..ddefc26 100644 |
20 |
--- a/mail-filter/maildrop/Manifest |
21 |
+++ b/mail-filter/maildrop/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
DIST maildrop-2.6.0.tar.bz2 2174922 SHA256 afc115119b2d3197c565002e158c2cb69d525288bf72c71919c3c74096b824a9 SHA512 210841add8aff389589802f15ea74776815ecfd0dd9d5fb4f244d101e3d3f5dbb833a38f1d539b869c49685cfe34b0e6e014a5888c2537c9d89c68d754248db4 WHIRLPOOL c6d8f2be69a02fa757ac4dd653c22c79c8da6c2c1c112d48e0d4c491238d20e4c093d01f728ea337b1ba12bc75d88c5a252ff036114fe2339666776f2be44e80 |
24 |
+DIST maildrop-2.8.3.tar.bz2 1992695 SHA256 58245ccd759382761c4cdbeaefbd37622e01f1c48e71251b06ea085a890ce6c9 SHA512 25168945764eda5c74641e205e3c784ca2ae27c15a5a6ddfe7a1c7b238cd6c3d5b0a3f7ce8b405b578d067f6f2aae5d7d6110da8bc89f91ac1c7fdc224ffd054 WHIRLPOOL 9d8ea100ad125e814663c76539b41f208448b3259193008fade1291de7ec98efe8cf5b9f8b7f267acc9be78ccba1b28a8165d99d59d7d6ada4b99aa10cd163ea |
25 |
|
26 |
diff --git a/mail-filter/maildrop/files/maildrop-testsuite-r2.patch b/mail-filter/maildrop/files/maildrop-testsuite-r2.patch |
27 |
new file mode 100644 |
28 |
index 0000000..479a8f5 |
29 |
--- /dev/null |
30 |
+++ b/mail-filter/maildrop/files/maildrop-testsuite-r2.patch |
31 |
@@ -0,0 +1,65 @@ |
32 |
+--- libs/maildrop/configure.ac 2015-06-27 17:55:08.000000000 +0000 |
33 |
++++ libs/maildrop/configure.ac 2015-09-22 05:23:33.000000000 +0000 |
34 |
+@@ -195,6 +195,15 @@ |
35 |
+ AC_DEFINE_UNQUOTED(MAXLONGSIZE, $MAXLONGSIZE, |
36 |
+ [ Maximum character size of a long ]) |
37 |
+ |
38 |
++dnl check for en_US locale |
39 |
++check_en_US() { |
40 |
++locale -a | grep en_US.utf8 > /dev/null |
41 |
++return $? |
42 |
++} |
43 |
++AC_MSG_CHECKING([for en_US.utf8]) |
44 |
++AM_CONDITIONAL([HAS_EN_US], [check_en_US]) |
45 |
++AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])]) |
46 |
++ |
47 |
+ dnl Checks for library functions. |
48 |
+ |
49 |
+ AC_FUNC_CLOSEDIR_VOID |
50 |
+--- libs/maildrop/Makefile.am 2015-06-27 17:55:08.000000000 +0000 |
51 |
++++ libs/maildrop/Makefile.am 2015-09-22 05:24:29.000000000 +0000 |
52 |
+@@ -75,9 +75,13 @@ |
53 |
+ maildrop.lsm testsuite.txt.idn testsuite.txt.noidn testsuite2 |
54 |
+ |
55 |
+ check-am: |
56 |
++if HAS_EN_US |
57 |
+ @chmod +x testsuite |
58 |
+ ./testsuite | cmp -s - $(srcdir)/$(TESTSUITE) |
59 |
+ @SHELL@ $(srcdir)/testsuite2 |
60 |
++else |
61 |
++ echo ' Need en_US.utf8 to run tests' |
62 |
++endif |
63 |
+ |
64 |
+ noinst_DATA=maildrop.html maildrop.1 maildropfilter.html maildropfilter.7 \ |
65 |
+ maildropgdbm.html maildropgdbm.7 |
66 |
+--- libs/rfc2045/configure.ac 2014-02-16 09:00:13.000000000 +0000 |
67 |
++++ libs/rfc2045/configure.ac 2015-09-22 05:28:18.000000000 +0000 |
68 |
+@@ -60,6 +60,15 @@ |
69 |
+ AC_CHECK_FUNC(strncasecmp,,CFLAGS="$CFLAGS -Dstrncasecmp=strnicmp") |
70 |
+ AC_CHECK_FUNC(strcasecmp,,CFLAGS="$CFLAGS -Dstrcasecmp=stricmp") |
71 |
+ |
72 |
++dnl check for en_US locale |
73 |
++check_en_US() { |
74 |
++locale -a | grep en_US.utf8 > /dev/null |
75 |
++return $? |
76 |
++} |
77 |
++AC_MSG_CHECKING([for en_US.utf8]) |
78 |
++AM_CONDITIONAL([HAS_EN_US], [check_en_US]) |
79 |
++AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])]) |
80 |
++ |
81 |
+ AC_ARG_WITH(package, [], package="$withval", |
82 |
+ [ |
83 |
+ package="$PACKAGE" |
84 |
+--- libs/rfc2045/Makefile.am 2015-02-28 17:59:41.000000000 +0000 |
85 |
++++ libs/rfc2045/Makefile.am 2015-09-22 05:29:08.000000000 +0000 |
86 |
+@@ -76,6 +76,10 @@ |
87 |
+ endif |
88 |
+ |
89 |
+ check-am: |
90 |
++if HAS_EN_US |
91 |
+ @SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE) |
92 |
+ @SHELL@ $(srcdir)/testsuitemm | cmp -s - $(srcdir)/testsuitemm.txt |
93 |
+ @SHELL@ $(srcdir)/testrfc3676parsersuite | diff -U 3 $(srcdir)/testrfc3676parsersuite.txt - |
94 |
++else |
95 |
++ echo ' Need en_US.utf8 to run tests' |
96 |
++endif |
97 |
|
98 |
diff --git a/mail-filter/maildrop/maildrop-2.8.3.ebuild b/mail-filter/maildrop/maildrop-2.8.3.ebuild |
99 |
new file mode 100644 |
100 |
index 0000000..afc63ac |
101 |
--- /dev/null |
102 |
+++ b/mail-filter/maildrop/maildrop-2.8.3.ebuild |
103 |
@@ -0,0 +1,145 @@ |
104 |
+# Copyright 1999-2015 Gentoo Foundation |
105 |
+# Distributed under the terms of the GNU General Public License v2 |
106 |
+# $Id$ |
107 |
+ |
108 |
+EAPI=5 |
109 |
+inherit eutils flag-o-matic autotools |
110 |
+ |
111 |
+DESCRIPTION="Mail delivery agent/filter" |
112 |
+[[ -z ${PV/?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
113 |
+[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
114 |
+[[ -z ${SRC_URI} ]] && SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2" |
115 |
+HOMEPAGE="http://www.courier-mta.org/maildrop/" |
116 |
+ |
117 |
+LICENSE="GPL-3" |
118 |
+SLOT="0" |
119 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
120 |
+IUSE="berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota" |
121 |
+ |
122 |
+CDEPEND="!mail-mta/courier |
123 |
+ net-mail/mailbase |
124 |
+ dev-libs/libpcre |
125 |
+ net-dns/libidn |
126 |
+ net-libs/courier-unicode |
127 |
+ gdbm? ( >=sys-libs/gdbm-1.8.0 ) |
128 |
+ mysql? ( net-libs/courier-authlib ) |
129 |
+ postgres? ( net-libs/courier-authlib ) |
130 |
+ ldap? ( net-libs/courier-authlib ) |
131 |
+ authlib? ( net-libs/courier-authlib ) |
132 |
+ fam? ( virtual/fam ) |
133 |
+ !gdbm? ( |
134 |
+ berkdb? ( >=sys-libs/db-3:* ) |
135 |
+ ) |
136 |
+ tools? ( |
137 |
+ !mail-mta/netqmail |
138 |
+ !net-mail/courier-imap |
139 |
+ !mail-mta/mini-qmail |
140 |
+ )" |
141 |
+DEPEND="${CDEPEND} |
142 |
+ virtual/pkgconfig" |
143 |
+RDEPEND="${CDEPEND} |
144 |
+ dev-lang/perl |
145 |
+ dovecot? ( net-mail/dovecot )" |
146 |
+REQUIRED_USE="mysql? ( authlib ) |
147 |
+ postgres? ( authlib ) |
148 |
+ ldap? ( authlib )" |
149 |
+ |
150 |
+S=${WORKDIR}/${P%%_pre} |
151 |
+ |
152 |
+src_prepare() { |
153 |
+ # Prefer gdbm over berkdb |
154 |
+ if use gdbm ; then |
155 |
+ use berkdb && elog "Both gdbm and berkdb selected. Using gdbm." |
156 |
+ elif use berkdb ; then |
157 |
+ epatch "${FILESDIR}"/${PN}-2.5.1-db.patch |
158 |
+ fi |
159 |
+ |
160 |
+ if ! use fam ; then |
161 |
+ epatch "${FILESDIR}"/${PN}-1.8.1-disable-fam.patch |
162 |
+ fi |
163 |
+ |
164 |
+ # no need to error out if no default - it will be given to econf anyway |
165 |
+ sed -i -e \ |
166 |
+ 's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \ |
167 |
+ "${S}"/libs/maildrop/configure.ac || die "sed failed" |
168 |
+ epatch "${FILESDIR}"/${PN}-testsuite-r2.patch |
169 |
+ eautoreconf |
170 |
+} |
171 |
+ |
172 |
+src_configure() { |
173 |
+ local myconf |
174 |
+ local mytrustedusers="apache dspam root mail fetchmail" |
175 |
+ mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias" |
176 |
+ |
177 |
+ # These flags make maildrop cry |
178 |
+ replace-flags -Os -O2 |
179 |
+ filter-flags -fomit-frame-pointer |
180 |
+ |
181 |
+ if use gdbm ; then |
182 |
+ myconf="${myconf} --with-db=gdbm" |
183 |
+ elif use berkdb ; then |
184 |
+ myconf="${myconf} --with-db=db" |
185 |
+ else |
186 |
+ myconf="${myconf} --without-db" |
187 |
+ fi |
188 |
+ |
189 |
+ if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then |
190 |
+ myconf="${myconf} --disable-authlib" |
191 |
+ fi |
192 |
+ |
193 |
+ # Default mailbox is $HOME/.maildir for Gentoo |
194 |
+ maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf \ |
195 |
+ $(use_enable fam) \ |
196 |
+ --disable-dependency-tracker \ |
197 |
+ --with-devel \ |
198 |
+ --disable-tempdir \ |
199 |
+ --enable-syslog=1 \ |
200 |
+ --enable-use-flock=1 \ |
201 |
+ --enable-use-dotlock=1 \ |
202 |
+ --enable-restrict-trusted=1 \ |
203 |
+ --enable-trusted-users="${mytrustedusers}" \ |
204 |
+ --enable-maildrop-uid=root \ |
205 |
+ --enable-maildrop-gid=mail \ |
206 |
+ --enable-sendmail=/usr/sbin/sendmail \ |
207 |
+ --cache-file="${S}"/configuring.cache \ |
208 |
+ $(use_enable static-libs static) \ |
209 |
+ $(use_enable dovecot dovecotauth) \ |
210 |
+ $(use_with trashquota) \ |
211 |
+ ${myconf} |
212 |
+} |
213 |
+ |
214 |
+src_install() { |
215 |
+ emake DESTDIR="${D}" install |
216 |
+ |
217 |
+ if use authlib ; then |
218 |
+ fperms 4755 /usr/bin/maildrop |
219 |
+ fi |
220 |
+ |
221 |
+ dodoc AUTHORS ChangeLog INSTALL NEWS README \ |
222 |
+ README.postfix README.dovecotauth UPGRADE \ |
223 |
+ maildroptips.txt |
224 |
+ docinto maildir |
225 |
+ dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \ |
226 |
+ libs/maildir/README*.txt |
227 |
+ |
228 |
+ # bugs #61116 #374009 |
229 |
+ if ! use tools ; then |
230 |
+ for tool in "maildirmake" "deliverquota"; do |
231 |
+ rm "${D}/usr/bin/${tool}" |
232 |
+ rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9] |
233 |
+ rm "${D}/usr/share/maildrop/html/${tool}.html" |
234 |
+ done |
235 |
+ rm "${D}/usr/share/man/man5/maildir.5" |
236 |
+ fi |
237 |
+ |
238 |
+ dodir "/usr/share/doc/${PF}" |
239 |
+ mv "${D}/usr/share/doc/maildrop/html" "${D}/usr/share/doc/${PF}/" || die |
240 |
+ rm -rf "${D}"/usr/share/doc/maildrop |
241 |
+ |
242 |
+ dohtml *.html libs/maildir/*.html |
243 |
+ |
244 |
+ insinto /etc |
245 |
+ doins "${FILESDIR}"/maildroprc |
246 |
+ |
247 |
+ use static-libs || find "${D}"/usr/lib* -name '*.la' -delete |
248 |
+} |
249 |
|
250 |
diff --git a/mail-filter/maildrop/metadata.xml b/mail-filter/maildrop/metadata.xml |
251 |
index 75e94b2..58142c1 100644 |
252 |
--- a/mail-filter/maildrop/metadata.xml |
253 |
+++ b/mail-filter/maildrop/metadata.xml |
254 |
@@ -4,6 +4,7 @@ |
255 |
<herd>net-mail</herd> |
256 |
<use> |
257 |
<flag name="authlib">Add courier-authlib support</flag> |
258 |
+ <flag name="dovecot">Add dovecot authentication support</flag> |
259 |
<flag name="tools">Install maildirmake and deliverquota tools</flag> |
260 |
<flag name="trashquota">Count deleted messages as part of the maildir quota</flag> |
261 |
</use> |