1 |
commit: 5cda653f481a0f4e17309af05290b425b8d2c53b |
2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 26 14:37:33 2019 +0000 |
4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 26 14:37:33 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cda653f |
7 |
|
8 |
net-mail/mailutils: bump to 3.6 |
9 |
|
10 |
and fix underlinking |
11 |
|
12 |
Closes: https://bugs.gentoo.org/677762 |
13 |
Closes: https://bugs.gentoo.org/665996 |
14 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
15 |
Signed-off-by: Eray Aslan <eras <AT> gentoo.org> |
16 |
|
17 |
net-mail/mailutils/Manifest | 1 + |
18 |
.../mailutils/files/mailutils-3.6-python3.patch | 59 +++++++++ |
19 |
.../files/mailutils-3.6-underlinking.patch | 11 ++ |
20 |
net-mail/mailutils/mailutils-3.6.ebuild | 141 +++++++++++++++++++++ |
21 |
4 files changed, 212 insertions(+) |
22 |
|
23 |
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest |
24 |
index fa03c7764a6..2edacc73018 100644 |
25 |
--- a/net-mail/mailutils/Manifest |
26 |
+++ b/net-mail/mailutils/Manifest |
27 |
@@ -1,3 +1,4 @@ |
28 |
DIST mailutils-3.1.1.tar.xz 2759000 BLAKE2B 146dbc17f222f5f6293c88861fbe75679bde9497d1e9db577441290a2946632ee946ba726cd618363c3f6c1e3bfc87cbd9e94f701ca90f794e6182370bc35ac3 SHA512 68a6f530935118f60503550aff925c799fee4de77377e726548f418e05687b1c8f29210bcb97e1b1033f9414bdbceeaa41e65496b0648a6356c8363554955e8c |
29 |
DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573 |
30 |
DIST mailutils-3.5.tar.xz 2742824 BLAKE2B ca14597114203234912cf4cfaa4c63e682561deb28d9d0825373c69de267c215d12b9db662cfd60024228e119433fb40a136d65cfd04385f881ba4b0384c8328 SHA512 6aa2de352be637295a8ab53207a8065f5c10655acc299ac0a2190937ec4decb515ac1044c9a7465b08764ca45be569012cce1046b40d748f6e4f31644f056a53 |
31 |
+DIST mailutils-3.6.tar.xz 2813412 BLAKE2B fa2cde98287f84745c1ccc213d2ee824857b9c64d493677ed817ae53d49576382d22784ad25faa644ca43528637ed629aa4e9a78a3b1040fd51658e54b369399 SHA512 f07b8dc570abf345d45439f4994173d2415f94d72291aac46528842e339aaa7925baf776ccfc8f8901cf0e08a13cbfdf09596dd6c448bf012af002ef5ce2fe0e |
32 |
|
33 |
diff --git a/net-mail/mailutils/files/mailutils-3.6-python3.patch b/net-mail/mailutils/files/mailutils-3.6-python3.patch |
34 |
new file mode 100644 |
35 |
index 00000000000..cad46d006a2 |
36 |
--- /dev/null |
37 |
+++ b/net-mail/mailutils/files/mailutils-3.6-python3.patch |
38 |
@@ -0,0 +1,59 @@ |
39 |
+From 4e66a6a9e5f5696d60f7df875175f2e0ad8f7376 Mon Sep 17 00:00:00 2001 |
40 |
+From: Sergey Poznyakoff <gray@×××.org> |
41 |
+Date: Sun, 24 Feb 2019 22:56:21 +0200 |
42 |
+Subject: Bugfix |
43 |
+ |
44 |
+* python/3/libmu_py/mailcap.c: Fix leftover uses of PyString_FromString |
45 |
+and PyInt_FromLong. |
46 |
+--- |
47 |
+ python/3/libmu_py/mailcap.c | 10 +++++----- |
48 |
+ 1 file changed, 5 insertions(+), 5 deletions(-) |
49 |
+ |
50 |
+diff --git a/python/3/libmu_py/mailcap.c b/python/3/libmu_py/mailcap.c |
51 |
+index 6db1770..fdb5b71 100644 |
52 |
+--- a/python/3/libmu_py/mailcap.c |
53 |
++++ b/python/3/libmu_py/mailcap.c |
54 |
+@@ -91,11 +91,11 @@ api_mailcap_create (PyObject *self, PyObject *args) |
55 |
+ |
56 |
+ status = mu_mailcap_create (&py_mc->mc); |
57 |
+ if (status) |
58 |
+- return _ro (PyInt_FromLong (status)); |
59 |
++ return _ro (PyLong_FromLong (status)); |
60 |
+ status = mu_mailcap_parse (py_mc->mc, py_stm->stm, NULL); |
61 |
+ if (status == MU_ERR_PARSE) |
62 |
+ status = 0; /* FIXME */ |
63 |
+- return _ro (PyInt_FromLong (status)); |
64 |
++ return _ro (PyLong_FromLong (status)); |
65 |
+ } |
66 |
+ |
67 |
+ static PyObject * |
68 |
+@@ -183,7 +183,7 @@ api_mailcap_entry_get_field (PyObject *self, PyObject *args) |
69 |
+ status = mu_mailcap_entry_sget_field (py_entry->entry, name, &value); |
70 |
+ return status_object (status, |
71 |
+ status == 0 |
72 |
+- ? (value ? PyString_FromString (value) |
73 |
++ ? (value ? PyUnicode_FromString (value) |
74 |
+ : PyBool_FromLong (1)) |
75 |
+ : PyBool_FromLong (0)); |
76 |
+ } |
77 |
+@@ -199,7 +199,7 @@ api_mailcap_entry_get_typefield (PyObject *self, PyObject *args) |
78 |
+ return NULL; |
79 |
+ |
80 |
+ status = mu_mailcap_entry_sget_type (py_entry->entry, &value); |
81 |
+- return status_object (status, PyString_FromString (status == 0 ? value : "")); |
82 |
++ return status_object (status, PyUnicode_FromString (status == 0 ? value : "")); |
83 |
+ } |
84 |
+ |
85 |
+ static PyObject * |
86 |
+@@ -213,7 +213,7 @@ api_mailcap_entry_get_viewcommand (PyObject *self, PyObject *args) |
87 |
+ return NULL; |
88 |
+ |
89 |
+ status = mu_mailcap_entry_sget_command (py_entry->entry, &value); |
90 |
+- return status_object (status, PyString_FromString (status == 0 ? value : "")); |
91 |
++ return status_object (status, PyUnicode_FromString (status == 0 ? value : "")); |
92 |
+ } |
93 |
+ |
94 |
+ static PyMethodDef methods[] = { |
95 |
+-- |
96 |
+cgit v1.0-41-gc330 |
97 |
+ |
98 |
|
99 |
diff --git a/net-mail/mailutils/files/mailutils-3.6-underlinking.patch b/net-mail/mailutils/files/mailutils-3.6-underlinking.patch |
100 |
new file mode 100644 |
101 |
index 00000000000..512a05f3a31 |
102 |
--- /dev/null |
103 |
+++ b/net-mail/mailutils/files/mailutils-3.6-underlinking.patch |
104 |
@@ -0,0 +1,11 @@ |
105 |
+--- a/configure.ac 2019-02-26 17:11:29.398115222 +0300 |
106 |
++++ b/configure.ac 2019-02-26 17:14:13.733899654 +0300 |
107 |
+@@ -985,7 +985,7 @@ |
108 |
+ AC_CHECK_LIB(ldap, ldap_bind,[ |
109 |
+ status_ldap=yes |
110 |
+ AC_DEFINE(WITH_LDAP, 1, [Define to 1 if you want to use -lldap]) |
111 |
+- MU_AUTHLIBS="$MU_AUTHLIBS -lldap"], |
112 |
++ MU_AUTHLIBS="$MU_AUTHLIBS -lldap -llber"], |
113 |
+ [status_ldap=no]) |
114 |
+ fi |
115 |
+ |
116 |
|
117 |
diff --git a/net-mail/mailutils/mailutils-3.6.ebuild b/net-mail/mailutils/mailutils-3.6.ebuild |
118 |
new file mode 100644 |
119 |
index 00000000000..0943bdb530c |
120 |
--- /dev/null |
121 |
+++ b/net-mail/mailutils/mailutils-3.6.ebuild |
122 |
@@ -0,0 +1,141 @@ |
123 |
+# Copyright 1999-2019 Gentoo Authors |
124 |
+# Distributed under the terms of the GNU General Public License v2 |
125 |
+ |
126 |
+EAPI=7 |
127 |
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) |
128 |
+ |
129 |
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs |
130 |
+ |
131 |
+DESCRIPTION="A useful collection of mail servers, clients, and filters" |
132 |
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html" |
133 |
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz" |
134 |
+ |
135 |
+LICENSE="GPL-2 LGPL-2.1" |
136 |
+SLOT="0" |
137 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos" |
138 |
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \ |
139 |
+ ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \ |
140 |
+ tokyocabinet" |
141 |
+ |
142 |
+RDEPEND="!mail-client/nmh |
143 |
+ !mail-filter/libsieve |
144 |
+ !mail-client/mailx |
145 |
+ !mail-client/nail |
146 |
+ sys-libs/ncurses:= |
147 |
+ sys-libs/readline:= |
148 |
+ dev-libs/libltdl:0 |
149 |
+ virtual/mta |
150 |
+ berkdb? ( sys-libs/db:= ) |
151 |
+ bidi? ( dev-libs/fribidi ) |
152 |
+ emacs? ( virtual/emacs ) |
153 |
+ gdbm? ( sys-libs/gdbm ) |
154 |
+ guile? ( dev-scheme/guile:12/2.2-1 ) |
155 |
+ kerberos? ( virtual/krb5 ) |
156 |
+ kyotocabinet? ( dev-db/kyotocabinet ) |
157 |
+ ldap? ( net-nds/openldap ) |
158 |
+ mysql? ( dev-db/mysql-connector-c ) |
159 |
+ nls? ( sys-devel/gettext ) |
160 |
+ pam? ( virtual/pam ) |
161 |
+ postgres? ( dev-db/postgresql:= ) |
162 |
+ python? ( ${PYTHON_DEPS} ) |
163 |
+ sasl? ( virtual/gsasl ) |
164 |
+ servers? ( virtual/libiconv dev-libs/libunistring ) |
165 |
+ ssl? ( net-libs/gnutls:= ) |
166 |
+ tcpd? ( sys-apps/tcp-wrappers ) |
167 |
+ tokyocabinet? ( dev-db/tokyocabinet )" |
168 |
+ |
169 |
+DEPEND="${RDEPEND} |
170 |
+ virtual/pkgconfig" |
171 |
+ |
172 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) |
173 |
+ servers? ( tcpd ) |
174 |
+ servers? ( ldap )" |
175 |
+ |
176 |
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO ) |
177 |
+PATCHES=( "${FILESDIR}/${PN}-3.5-add-include.patch" \ |
178 |
+ "${FILESDIR}/${PN}-3.6-python3.patch" |
179 |
+ "${FILESDIR}/${PN}-3.6-underlinking.patch" ) |
180 |
+ |
181 |
+pkg_setup() { |
182 |
+ use python && python-single-r1_pkg_setup |
183 |
+} |
184 |
+ |
185 |
+src_prepare() { |
186 |
+ default |
187 |
+ if use mysql; then |
188 |
+ sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \ |
189 |
+ sql/Makefile.am || die |
190 |
+ fi |
191 |
+ # bug 669946 |
192 |
+ #eapply "${FILESDIR}/${PN}-3.5-add-include.patch" |
193 |
+ #eapply_user |
194 |
+ eautoreconf |
195 |
+} |
196 |
+ |
197 |
+src_configure() { |
198 |
+ append-flags -fno-strict-aliasing |
199 |
+ |
200 |
+ # maildir is the Gentoo default |
201 |
+ econf MU_DEFAULT_SCHEME=maildir \ |
202 |
+ CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \ |
203 |
+ $(use_with berkdb berkeley-db) \ |
204 |
+ $(use_with bidi fribidi) \ |
205 |
+ $(use_enable ipv6) \ |
206 |
+ $(use_with gdbm) \ |
207 |
+ $(use_with sasl gsasl) \ |
208 |
+ $(use_with guile) \ |
209 |
+ $(use_with kerberos gssapi) \ |
210 |
+ $(use_with ldap) \ |
211 |
+ $(use_with mysql) \ |
212 |
+ $(use_enable nls) \ |
213 |
+ $(use_enable pam) \ |
214 |
+ $(use_with postgres) \ |
215 |
+ $(use_enable python) \ |
216 |
+ $(use_with ssl gnutls) \ |
217 |
+ $(use_enable static-libs static) \ |
218 |
+ $(use_enable threads pthread) \ |
219 |
+ $(use_with tokyocabinet) \ |
220 |
+ $(use_with kyotocabinet) \ |
221 |
+ $(use_with tcpd tcp-wrappers) \ |
222 |
+ $(use_enable servers build-servers) \ |
223 |
+ $(use_with servers unistring ) \ |
224 |
+ $(use_enable clients build-clients) \ |
225 |
+ EMACS=$(usex emacs emacs no) \ |
226 |
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \ |
227 |
+ --with-mail-spool=/var/spool/mail \ |
228 |
+ --with-readline \ |
229 |
+ --enable-sendmail \ |
230 |
+ --disable-debug |
231 |
+} |
232 |
+ |
233 |
+src_install() { |
234 |
+ default |
235 |
+ emake DESTDIR="${D}" install |
236 |
+ |
237 |
+ insinto /etc |
238 |
+ # bug 613112 |
239 |
+ newins "${FILESDIR}/mailutils.rc" mailutils.conf |
240 |
+ keepdir /etc/mailutils.d/ |
241 |
+ insinto /etc/mailutils.d |
242 |
+ doins "${FILESDIR}/mail" |
243 |
+ |
244 |
+ if use python; then |
245 |
+ python_optimize |
246 |
+ if use static-libs; then |
247 |
+ rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die |
248 |
+ fi |
249 |
+ fi |
250 |
+ |
251 |
+ if use servers; then |
252 |
+ newinitd "${FILESDIR}"/imap4d.initd imap4d |
253 |
+ newinitd "${FILESDIR}"/pop3d.initd pop3d |
254 |
+ newinitd "${FILESDIR}"/comsatd.initd comsatd |
255 |
+ fi |
256 |
+ |
257 |
+ #dodoc AUTHORS ChangeLog NEWS README* THANKS TODO |
258 |
+ |
259 |
+ # compatibility link |
260 |
+ use clients && dosym /usr/bin/mail /bin/mail |
261 |
+ |
262 |
+ use static-libs || find "${D}" -name "*.la" -delete |
263 |
+} |