| 1 |
grobian 13/11/01 19:55:09 |
| 2 |
|
| 3 |
Modified: exim-4.82.ebuild metadata.xml ChangeLog |
| 4 |
Log: |
| 5 |
Make support for PKCS#11 optional with USE=gnutls, cleanup some legacy code |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 mail-mta/exim/exim-4.82.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.82.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.82.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.82.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: exim-4.82.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.82.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- exim-4.82.ebuild 30 Oct 2013 00:59:22 -0000 1.2 |
| 23 |
+++ exim-4.82.ebuild 1 Nov 2013 19:55:09 -0000 1.3 |
| 24 |
@@ -1,13 +1,13 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.82.ebuild,v 1.2 2013/10/30 00:59:22 jer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.82.ebuild,v 1.3 2013/11/01 19:55:09 grobian Exp $ |
| 29 |
|
| 30 |
-EAPI="4" |
| 31 |
+EAPI="5" |
| 32 |
|
| 33 |
inherit eutils toolchain-funcs multilib pam systemd |
| 34 |
|
| 35 |
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis selinux syslog spf srs gnutls sqlite doc dovecot-sasl radius maildir +dkim dcc dsn dlfunc dmarc" |
| 36 |
-REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim )" |
| 37 |
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis selinux syslog spf srs gnutls pkcs11 sqlite doc dovecot-sasl radius maildir +dkim dcc dsn dlfunc dmarc" |
| 38 |
+REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )" |
| 39 |
|
| 40 |
DSN_EXIM_V=482 # local version patched by us |
| 41 |
DSN_V=1_3 |
| 42 |
@@ -31,7 +31,7 @@ |
| 43 |
pam? ( virtual/pam ) |
| 44 |
tcpd? ( sys-apps/tcp-wrappers ) |
| 45 |
ssl? ( dev-libs/openssl ) |
| 46 |
- gnutls? ( net-libs/gnutls[pkcs11] |
| 47 |
+ gnutls? ( net-libs/gnutls[pkcs11?] |
| 48 |
dev-libs/libtasn1 ) |
| 49 |
ldap? ( >=net-nds/openldap-2.0.7 ) |
| 50 |
mysql? ( virtual/mysql ) |
| 51 |
@@ -95,13 +95,6 @@ |
| 52 |
epatch "${FILESDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch |
| 53 |
fi |
| 54 |
|
| 55 |
- if use ipv6 ; then |
| 56 |
- # set a sensible default, bug #448314 |
| 57 |
- sed -i \ |
| 58 |
- -e '/^hostlist\s\+relay_from_hosts/s/\(127.0.0.1\)/\1 : ::::1/' \ |
| 59 |
- src/configure.default || die |
| 60 |
- fi |
| 61 |
- |
| 62 |
# user Exim believes it should be |
| 63 |
MAILUSER=mail |
| 64 |
MAILGROUP=mail |
| 65 |
@@ -215,6 +208,7 @@ |
| 66 |
if use gnutls; then |
| 67 |
echo "USE_GNUTLS=yes" >> Makefile |
| 68 |
echo "USE_GNUTLS_PC=gnutls" >> Makefile |
| 69 |
+ use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile |
| 70 |
else |
| 71 |
echo "USE_OPENSSL_PC=openssl" >> Makefile |
| 72 |
fi |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.16 mail-mta/exim/metadata.xml |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/metadata.xml?rev=1.16&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/metadata.xml?rev=1.16&content-type=text/plain |
| 80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/metadata.xml?r1=1.15&r2=1.16 |
| 81 |
|
| 82 |
Index: metadata.xml |
| 83 |
=================================================================== |
| 84 |
RCS file: /var/cvsroot/gentoo-x86/mail-mta/exim/metadata.xml,v |
| 85 |
retrieving revision 1.15 |
| 86 |
retrieving revision 1.16 |
| 87 |
diff -u -r1.15 -r1.16 |
| 88 |
--- metadata.xml 30 Sep 2013 19:33:08 -0000 1.15 |
| 89 |
+++ metadata.xml 1 Nov 2013 19:55:09 -0000 1.16 |
| 90 |
@@ -35,6 +35,7 @@ |
| 91 |
<flag name='mbx'>Adds support for UW's mbx format</flag> |
| 92 |
<flag name='spf'>Adds support for Sender Policy Framework</flag> |
| 93 |
<flag name='srs'>Adds support for Sender Rewriting Scheme</flag> |
| 94 |
+ <flag name='pkcs11'>Require pkcs11 support in <pkg>net-libs/gnutls</pkg> with USE=gnutls</flag> |
| 95 |
</use> |
| 96 |
<upstream> |
| 97 |
<bugs-to>http://bugs.exim.org/</bugs-to> |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
1.269 mail-mta/exim/ChangeLog |
| 102 |
|
| 103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?rev=1.269&view=markup |
| 104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?rev=1.269&content-type=text/plain |
| 105 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?r1=1.268&r2=1.269 |
| 106 |
|
| 107 |
Index: ChangeLog |
| 108 |
=================================================================== |
| 109 |
RCS file: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v |
| 110 |
retrieving revision 1.268 |
| 111 |
retrieving revision 1.269 |
| 112 |
diff -u -r1.268 -r1.269 |
| 113 |
--- ChangeLog 30 Oct 2013 00:59:22 -0000 1.268 |
| 114 |
+++ ChangeLog 1 Nov 2013 19:55:09 -0000 1.269 |
| 115 |
@@ -1,6 +1,10 @@ |
| 116 |
# ChangeLog for mail-mta/exim |
| 117 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 118 |
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.268 2013/10/30 00:59:22 jer Exp $ |
| 119 |
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.269 2013/11/01 19:55:09 grobian Exp $ |
| 120 |
+ |
| 121 |
+ 01 Nov 2013; Fabian Groffen <grobian@g.o> exim-4.82.ebuild, |
| 122 |
+ metadata.xml: |
| 123 |
+ Make support for PKCS#11 optional with USE=gnutls, cleanup some legacy code |
| 124 |
|
| 125 |
30 Oct 2013; Jeroen Roovers <jer@g.o> exim-4.82.ebuild: |
| 126 |
Marked ~hppa (bug #489676). |
Archives