Gentoo Archives: gentoo-commits

From: Eray Aslan <eras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/files/, net-mail/mailutils/
Date: Thu, 24 Dec 2015 07:44:29
Message-Id: 1450942692.262d9d7e58d664c50b12bf84e9dbc97cc9cb4539.eras@gentoo
1 commit: 262d9d7e58d664c50b12bf84e9dbc97cc9cb4539
2 Author: Eray Aslan <eras <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 24 07:38:12 2015 +0000
4 Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 24 07:38:12 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=262d9d7e
7
8 Fix building with -tcpd USE flag (#569066)
9
10 Package-Manager: portage-2.2.26
11
12 .../mailutils/files/mailutils-tcp_wrappers.patch | 22 ++++++++++++++++++++++
13 net-mail/mailutils/mailutils-2.99.99.ebuild | 7 +++++--
14 2 files changed, 27 insertions(+), 2 deletions(-)
15
16 diff --git a/net-mail/mailutils/files/mailutils-tcp_wrappers.patch b/net-mail/mailutils/files/mailutils-tcp_wrappers.patch
17 new file mode 100644
18 index 0000000..81517ca
19 --- /dev/null
20 +++ b/net-mail/mailutils/files/mailutils-tcp_wrappers.patch
21 @@ -0,0 +1,22 @@
22 +--- a/maidag/maidag.c 2015-07-02 22:45:39.000000000 +0300
23 ++++ b/maidag/maidag.c 2015-12-22 11:55:17.000000000 +0200
24 +@@ -518,7 +518,9 @@
25 +
26 + mu_gocs_register ("sieve", mu_sieve_module_init);
27 +
28 ++#ifdef WITH_LIBWRAP
29 + mu_tcpwrapper_cfg_init ();
30 ++#endif
31 + mu_acl_cfg_init ();
32 + mu_m_server_cfg_init (NULL);
33 + maidag_cfg_init ();
34 +@@ -531,7 +533,9 @@
35 +
36 + mu_m_server_create (&server, program_version);
37 + mu_m_server_set_conn (server, lmtp_connection);
38 ++#ifdef WITH_LIBWRAP
39 + mu_m_server_set_prefork (server, mu_tcp_wrapper_prefork);
40 ++#endif
41 + mu_m_server_set_mode (server, MODE_INTERACTIVE);
42 + mu_m_server_set_max_children (server, 20);
43 + mu_m_server_set_timeout (server, 600);
44
45 diff --git a/net-mail/mailutils/mailutils-2.99.99.ebuild b/net-mail/mailutils/mailutils-2.99.99.ebuild
46 index 16a9fec..aac4a57 100644
47 --- a/net-mail/mailutils/mailutils-2.99.99.ebuild
48 +++ b/net-mail/mailutils/mailutils-2.99.99.ebuild
49 @@ -48,7 +48,8 @@ RDEPEND="!mail-client/nmh
50 DEPEND="${RDEPEND}
51 virtual/pkgconfig"
52
53 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
54 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
55 + servers? ( tcpd )"
56
57 pkg_setup() {
58 use python && python-single-r1_pkg_setup
59 @@ -58,10 +59,11 @@ src_prepare() {
60 # Disable bytecompilation of Python modules.
61 echo "#!/bin/sh" > build-aux/py-compile
62 epatch "${FILESDIR}/${PN}-2.99.98-readline-6.3.patch" #503954
63 + epatch "${FILESDIR}/${PN}-tcp_wrappers.patch"
64 if use mysql; then
65 sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
66 sql/Makefile.am || die
67 - eautoreconf
68 + eautoreconf
69 fi
70 }
71
72 @@ -90,6 +92,7 @@ src_configure() {
73 $(use_enable threads pthread) \
74 $(use_with tokyocabinet) \
75 $(use_with kyotocabinet) \
76 + $(use_with tcpd tcp-wrappers) \
77 $(use_enable servers build-servers) \
78 $(use_enable clients build-clients) \
79 --with-mail-spool=/var/spool/mail \