commit: 43cadafd29fa147b1b79269a7b958ac6ad97afd8
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 20:46:11 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 20:46:11 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=43cadafd
mail-mta/exim: bump to 4.87
Package-Manager: portage-2.2.28
RepoMan-Options: --force
mail-mta/exim/Manifest | 13 +++---
.../{exim-4.85-r99.ebuild => exim-4.87-r99.ebuild} | 46 +++++++++++++++-----
...ags.patch => exim-4.87-as-needed-ldflags.patch} | 49 +++++++++++-----------
mail-mta/exim/files/exim.rc8 | 30 -------------
mail-mta/exim/files/exim.rc9 | 2 +-
mail-mta/exim/metadata.xml | 1 +
6 files changed, 68 insertions(+), 73 deletions(-)
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 183c794..698564b 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -5,20 +5,19 @@ AUX exim-4.69-r1.27021.patch 1447 SHA256
dc81115be1324cf2d61ff2e2393462bd31aa635
AUX exim-4.74-localscan_dlopen.patch 9280 SHA256
dcd44f552e9b9b79facc988c9efad3ab1609a4e4209e9276323f49d1ea00e462 SHA512
bfd35b8fcc7b8bd50a28b2bb7865d358ed1af3978b057da1c83a0be38ba30a737d983b6b5cf829559ba8c490709d28bdb7d679eb825fe7e24798ec223bedc94e
WHIRLPOOL
7140c45782d8611638f3aecc960f890963b1d34fd1cca7a5b78058a616607d10c1a50d4110498e9c3d700ca04df8797c184ce816bfd1cab8931bd4eb9ef3aa8a
AUX exim-4.74-radius-db-ENV-clash.patch 667 SHA256
a4150c9b73203dd284faa646a67e39f431d07c6a378af8fabc97a4ad9e078437 SHA512
040bbdb2259df882569a428b7fef03f89c3685428654ac29e93360a4791bdabe66e52d33d14f0822461fac119295bd31aad5998f63d59d4af057bd26b310a568
WHIRLPOOL
3ef9641fc821be5d7477ccc41f8656f987a896e883a7aa3a627b92e64e2663a87f345bd0fc46ae1b4b9f6ac09a560c951c0396dd135305c97821374d8aa08806
AUX exim-4.76-crosscompile.patch 462 SHA256
25ba013858b0fc239e24166554c1e28832d3d25801b53ca633f289bc4ae72b8e SHA512
d4fd4417c1ce727f139999c399795312cdbbb9735d0793d68f8e3150240bc53b31277cb26f9946ba549b34c661fc0a61147d376bda09aa6763cab55d80d62343
WHIRLPOOL
22026d355888efb2f823842c596fb670f0821076fe6faaae9d0a6ecf57a4a6de52af9f720e784e8d7bbcf681494a020f22e75f4a2aa079d30880f5c9af759405
-AUX exim-4.77-as-needed-ldflags.patch 5954 SHA256
3960f6883f7c3b44110ca5916ad8fa63f829516624c011a807cda00972b4dffd SHA512
716cac89116b66df645a6d49c88369ed062e3d3cf158fb50420984fe1fd2c1d3f56ad3a59ba36bb5d88dc9f8194f5fa105340baa82120b63298a245c6aaaaca2
WHIRLPOOL
8e321d3abf5a2d55af93d7cc865a33b1b8f13ba19af8ce6b17c29ba7b4003b4cc7acb4789ab941e8dc0b475d8568c0934e8da2c429dec9099901e85b966830d0
AUX exim-4.80-spool-mail-group.patch 946 SHA256
4f013e30f6f96360baa7d5d7818eaf5247984ab0eb43b8b5ba8d1bd8704b811b SHA512
24f30e9a9d90dc0f1fe8b3db26f8bc2649182b4e78110dc28a9c0f3a3feb7589f923144a4f1c54a1c46ff8cfe40826a1f2212787753be752f4d15a72d54a143b
WHIRLPOOL
aa34f4e721fda796ebeb091514ec35ffcf153e813b7760245d25da5d6f27590734d28032498a0ffb2262e170355b0a99b53947818e669d1f79bd0393ae85a2d6
AUX exim-4.82-makefile-freebsd.patch 1252 SHA256
c407ea37ff8125f20f535ddb02793d5242a12582b9ab388d2ba956f932af2f3d SHA512
fb440ad3e46b90d4c2e4826841944f4006390ccebee08154a39e46f6854be15edd7d0b028333b41451a0511f886ad3a30cb4b86e7ba8be99f12616a137f09d56
WHIRLPOOL
72132bdce44ba23fb162a5afaed33ea72ef2c917d020f5ddf920ce16991f02411c0bbcb23526b0e09753ab84cf2f258108aa2283ce5f9529810844497df29501
+AUX exim-4.87-as-needed-ldflags.patch 6009 SHA256
5c5ccba122796c67b853ea2d408a6c8a4bae06429ebebd2eb1a79cb64e09591f SHA512
e9916ab0d616ae081f4c430e9e1a5101d59dee59c1893c48a1ae9faafe4c3e742607b825a20edc11bc1b3865e7785d46ce66299fc4fefdc9b11bce27b2c523c7
WHIRLPOOL
e66031ac1db413e29530494d4cac61ece05d12c12795b082420824d4deb499443cee3275cde593c7a329729914962e061bab33265b5a405df57d630444afbaa3
AUX exim-submission.socket 161 SHA256
d3bb58f0fbeaaa33c812a823708664bbcd828da7d24e2a098f84a15aee443fee SHA512
4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d
WHIRLPOOL
7fe2a157ae3361440d8a85c8eca44a97a289be1689261efda943076c9a76ab74ef9d5f01ec0eecdde940ae30ccb46530c95d7223cf62b78e8eb2bde5268288e2
AUX exim-submission_at.service 360 SHA256
55719e8b823702b0054584326ca28349b7487e5be9e567ddc7a6e6259767e05b SHA512
dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f
WHIRLPOOL
8e907250dc6be75a252b0a6880004b05fccb2ebeb044a4538bc88eae6ed81f5a537a319188320657d43b3ae1850e11cfa0d86393b038d2d0d1e9a0ce7a7543fc
AUX exim.confd 141 SHA256
352c48d5302d122d75b821395933150e1fc6e16004b0d28e99a14b60f160ee6e SHA512
cb5e4aa71d3f0b7945e9806064f6a3ab64cb894381654ead40c73a49ae2d1bbb3dc587919952a09b2c81b9fcf8784f73d59c12081cda96a5b7210442f5088998
WHIRLPOOL
078764d27c5c7614120ac0f531b97ac4b65a68ee741fe11fd3ae68e8e89307cc3aaab6d7ee651ec5969479cf9f752933c54faef1e068efa3fda85360343f4d39
AUX exim.logrotate 116 SHA256
755eab8631ebc103fff111b0c37ff104a34f8fdff349d383d62cd91db3bc0984 SHA512
24bb8dcfadb1204c2ab0316d57de287b5092754731949390cfb3c88fa6827d45acfe1048cf9e26f615ca0449e8d780d0c98ea55ed61be9d1558755d3e53b9ec8
WHIRLPOOL
7c3092e99e20a038fe21f10ada71bae39faa31de6d032b0bd02a373a92b34f3972ab68642cca072364b28d3c0cbe3f35787f137681b8d8093105fb56abd9c7ed
-AUX exim.rc8 658 SHA256
4503e81f07a313e05048cb6c48257e46c1ca557c5c8e5acf03a0d7c97f737e52 SHA512
a00a92caf027742957e155e459ae7542e874ec8f9f3faa0887f0d91cd210a9f313ae0c643dafbe21f2b837d35cae3eea045f81465af68b96953af9503a1489f9
WHIRLPOOL
4b5779ba115c3dbf0611f33931a15b71a8fb349b1dddc1fc0044a5318b9ea18d2486ba4121a3b871cac195d5a49085a18cf905b61cc36f909099854b45fe167a
-AUX exim.rc9 1139 SHA256
ea23f2461d4d5fb5d619e8facf072676936dc3d12566bfdbfe13a8fefc39d022 SHA512
a3a4abce738b3dc0fcdd39fed7eae83ab201c5a6a87e05d332eaaa2acf0c9242d33f63e9227e80da153eef5c860e2bd116e04f64bb6b997829a9ebfb25be97ba
WHIRLPOOL
e134327826c27355753f32670c4ee6f707709b1a042542151dcfdd34dfa48c8371179e8a42856f0d9e868221de2b206eb27d9f06923c9f7d2b944eca9d373d63
+AUX exim.rc9 1140 SHA256
f600fc66bfbdc5b3d643715e01dda0c78eae1ff367e0385f8d1ee3b76f6fa08a SHA512
853b65ad5ebcbd76a053ec5bcad4604ea339198dd13b2b9eaf6226e8c85ca706968f3810a6e8760f07ae3ff277780a1b35463ac7f7b2a410114c2819fb984c26
WHIRLPOOL
ef24fa7e6dfe6c529e10e3da21c3ead60dec7063a86a18995c048f5babe8de97d4ed5401d4c6f8bc043c3cefc3c7296436f7e8fcb2fedf1258f32c8387d8df5d
AUX exim.service 229 SHA256
6e5372338d93b75d96bf571d892b167ac812378bcf978dcd3f3324d7e612463a SHA512
a071e9fb74b5fc2fdf0c73ad64ddfbc3954d8f7095d6a363dacf8c75d72a479fbf6821822ec5c8f3846d7687342e1bd447b97f91ca7b0582e5c98008aac30cca
WHIRLPOOL
5f2ccd6898c95599f8e801aa111c53dbb50b7ec9f6ba6552fe195ad07d41efdcbff765cba1d696df6acb564bca29830d0bf61bcda9a244a3b48354318914bbd5
AUX exim.socket 139 SHA256
3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26 SHA512
db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae
WHIRLPOOL
6ddceaa1bf31d995afa2dc49ab4d8e1068321ab12b158e075f6ea3f2cc4dff35c2052da2a85fe998813354755e574670086880ef7e42e2a02877d4f766706d3c
AUX exim_at.service 140 SHA256
faad96dadbb2750faa5652d830f10d5a14be487a42e8db1cec797164acf14b73 SHA512
11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a
WHIRLPOOL
78f0c825526ae890458c4e71df2bd724d77d508081c6d6c2e3493732f11576ffeed755968dd2f3bcfb1cc6e0b0d61ea9fc175cd71340d908646f1a9ccbc7406e
-DIST exim-4.85.tar.bz2 1784150 SHA256
13211f2bbc5400d095a9b4be075eb1347e0d98676fdfe4be8a3b4d56281daaa4 SHA512
2c5846528ee98e4aff5dbabe49dfa5ba6753fa64154b9671a7849db8a17773917fe13bcb9e5f732c43d7479debfadd8012b8650823eb12504a6b1b28be456161
WHIRLPOOL
4057cd745f12ff62e956838406544060d3d2d7383027959f3c1ca12eff43bddb9be63e284767245b271e53bef92596c1241f5e90e9ed611d02e95b7a30adc7c8
-DIST exim-html-4.85.tar.bz2 467069 SHA256
fd91946369626e74842a0799b93d0d9e4a201fe640af84e1b5349fe6ff204167 SHA512
8214576300827f79c0880e2d2163f71d7f1b3fe2aff714b591a011e48816965de5a773c3509137b085fec3d4d2128931f8398768c24dad6c92b7df27cbcafe74
WHIRLPOOL
a7edffd7124c4920708616d3e59c0db5159dee5f7e4fd62ce29fdba769d39781a3826d4e3e39cdc97669941bb9a5c977defe280feb73cbe159b23df4cb6fe95f
+DIST exim-4.87.tar.bz2 1801422 SHA256
74691e0dff4d1b5d387e9c33c86f96a8f6d2adbc781c0dec9d2061a847b07dc9 SHA512
2b0d5c82133315c444e29abd182e0866482c904db1abe5ffe9a3008c2174f52eca850a433c069b4102874dc32bbe4af112beac94ffa154f1c06615c24deb47a4
WHIRLPOOL
3aede6629fbf41a71f6907e636458165258b523a3080d0b59ba6b295c1a258d8ce205a3295d4c49c2e6e88ef597b64895684fd47a3f5c3fba360d8e56be5f7f9
+DIST exim-html-4.87.tar.bz2 478953 SHA256
8f87876d4a392f59d1009ba64ac461862951a3f4eed9c0b14a49be7bcbdc1f12 SHA512
224884abfd7ab9a2410dbdd24bb65545faf427f1b83a942c6c72309e7d85771f78bf7dc5ec1439de95e1038959cdfc4ab549abb98852c8b17c8310b51ad0385c
WHIRLPOOL
0444f0b8d8f2e6fab66e9ec7b169eb1d175247e31c323f0a2817b60e2ce6b75057c8d38477697472b009f73fd4b285595b8ca09bac845763767e8146d6c87491
DIST system_filter.exim.gz 3075 SHA256
3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437 SHA512
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
WHIRLPOOL
ce68d9c18b24eca3ef97ea810964cc1ada5f85b795a7c432ad39b5788188a16419101c92fb52b418738d760e1d658f7a41485e5561079a667d84d276c71be5a4
-EBUILD exim-4.85-r99.ebuild 12288 SHA256
cf6dc619e77c325c0264b9ec1df7a60a7de893ed32e7229eb86a0b23ab1cad9b SHA512
9a8612d6d8319be09219d4a83127ed69f3df1e6a2b1124bbd87f02894febb724acfa1588540b95dcbda6de8c16f62495dba7b03f456fcb182199755eded72962
WHIRLPOOL
0a3aa2cff0668438d355fe04f27a46a96b352a4e08139cffeb69db0c08671f6e357d8ad4fe5d82775421477ccfa15fdebb0c46d69180ddd8f82459bb9df1cc10
-MISC metadata.xml 2395 SHA256
cf1040796cd7e9d41615b57a6d5161306bfd1d11ae54f0406fc8b227d1bb2994 SHA512
450661c02818f5156dbf2d8b624526afabb221e60f719f571fea8b72b1fc3c0b5c4158e665faccebdb8f06feea585c96751e929c4880bc5931362dc00911f37a
WHIRLPOOL
168ee8b8481979965d8ecf5c62a0f1d59e09965fc4089d9d0eb6f732554b360d79596bffe129b8dd42b0f7fb1b93a027ffcc6aa00ef16ae405f66cd2ab49605a
+EBUILD exim-4.87-r99.ebuild 12840 SHA256
4d859ade0e316973ce7216957ea988e647cf3b955b2b91907f96f4b57e487faf SHA512
06281fd64af8b09680f4866a79e8db509cceda95d4977cc604dbfbd997c3f82ce299a53e6788217af73129b1325590ca1802071a170af63e2e19e71a51508235
WHIRLPOOL
c59d6c594d7ba0cef52b7da7d8a8789066fa3bdfbf46bec48cda3cc74dc40265f477285290cfdf3f68045f4e219e40d79169b4a5d703ac9f5ab79922e488f5b9
+MISC metadata.xml 2482 SHA256
ec45d3ec75d244d4e842d76157f927deb78c933d01fabbefd1dc3f3a1666494d SHA512
dcda0d8164098a41d7defa30b84b36bfdc6fc1fecce2dc680aa22341f67be9dad281bdee0b6f9028459b4a62d4f3a83a16bd1cdca99238b114532c7b06f5c25f
WHIRLPOOL
5bdfc907c3fe72cfa3846a183737de42315ebee92e168835347a419366049daab2b9ad236bc24889828d96dac8cd6d44711ccbe8de895ec9da909f5ec1c4d72c
diff --git a/mail-mta/exim/exim-4.85-r99.ebuild
b/mail-mta/exim/exim-4.87-r99.ebuild
similarity index 90%
rename from mail-mta/exim/exim-4.85-r99.ebuild
rename to mail-mta/exim/exim-4.87-r99.ebuild
index 31e85d7..32307c6 100644
--- a/mail-mta/exim/exim-4.85-r99.ebuild
+++ b/mail-mta/exim/exim-4.87-r99.ebuild
@@ -6,8 +6,14 @@ EAPI="5"
inherit eutils toolchain-funcs multilib pam systemd
-IUSE="dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls
ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy
radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X"
-REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim )
pkcs11? ( gnutls )"
+IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl
gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres
+prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X
elibc_glibc"
+REQUIRED_USE="
+ dane? ( !gnutls )
+ dmarc? ( spf dkim )
+ pkcs11? ( gnutls )
+ spf? ( exiscan-acl )
+ srs? ( exiscan-acl )
+"
COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo
/test)"
@@ -22,17 +28,24 @@ LICENSE="GPL-2"
KEYWORDS="amd64 ~arm ~mips ppc x86"
COMMON_DEPEND=">=sys-apps/sed-4.0.5
- >=sys-libs/db-3.2
+ >=sys-libs/db-3.2:=
dev-libs/libpcre
perl? ( dev-lang/perl:= )
pam? ( virtual/pam )
tcpd? ( sys-apps/tcp-wrappers )
- ssl? ( dev-libs/openssl )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
gnutls? ( net-libs/gnutls[pkcs11?]
dev-libs/libtasn1 )
ldap? ( >=net-nds/openldap-2.0.7 )
+ nis? ( elibc_glibc? ( || (
+ <sys-libs/glibc-2.23
+ >=sys-libs/glibc-2.23[rpc]
+ ) ) )
mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
+ postgres? ( dev-db/postgresql:= )
sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
redis? ( dev-libs/hiredis )
spf? ( >=mail-filter/libspf2-1.2.5-r1 )
@@ -45,7 +58,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
x11-libs/libXaw
)
sqlite? ( dev-db/sqlite )
- radius? ( net-dialup/radiusclient )
+ radius? ( net-dialup/freeradius-client )
virtual/libiconv
"
# added X check for #57206
@@ -80,7 +93,7 @@ src_prepare() {
epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
- epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279
+ epatch "${FILESDIR}"/exim-4.87-as-needed-ldflags.patch # 352265, 391279
epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
if use maildir ; then
@@ -220,7 +233,7 @@ src_configure() {
if use redis; then
cat >> Makefile <<- EOC
- EXPERIMENTAL_REDIS=yes
+ LOOKUP_REDIS=yes
LOOKUP_LIBS += -lhiredis
EOC
fi
@@ -317,6 +330,13 @@ src_configure() {
#
# experimental features
+ # DANE
+ if use dane; then
+ cat >> Makefile <<- EOC
+ EXPERIMENTAL_DANE=yes
+ EOC
+ fi
+
# Distributed Checksum Clearinghouse
if use dcc; then
echo "EXPERIMENTAL_DCC=yes">> Makefile
@@ -405,14 +425,14 @@ src_configure() {
if use radius; then
cat >> Makefile <<- EOC
RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
- RADIUS_LIB_TYPE=RADIUSCLIENT
- AUTH_LIBS += -lradiusclient
+ RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+ AUTH_LIBS += -lfreeradius-client
EOC
fi
}
src_compile() {
- emake -j1 CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
+ emake CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
|| die "make failed"
}
@@ -486,6 +506,7 @@ pkg_postinst() {
einfo "${EROOT}etc/exim/auth_conf.sub contains the
configuration sub for using smtp auth."
einfo "Please create ${EROOT}etc/exim/exim.conf from
${EROOT}etc/exim/exim.conf.dist."
fi
+ use dane && einfo "DANE support is experimental"
if use dcc ; then
einfo "DCC support is experimental, you can find some limited"
einfo "documentation at the bottom of this prerelease message:"
@@ -510,4 +531,7 @@ pkg_postinst() {
einfo "cleaning from time to time. (${EROOT}var/spool/exim/db)"
einfo "Please use the exim_tidydb tool as documented in the Exim
manual:"
einfo
"http://www.exim.org/exim-html-current/doc/html/spec_html/ch-exim_utilities.html#SECThindatmai";
+ einfo "For CVE-2016-1531, Exim introduced keep_environment and"
+ einfo "add_environment flags. You might want to set them, see:"
+ einfo
"https://lists.exim.org/lurker/message/20160302.191005.a72d8433.en.html";
}
diff --git a/mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch
b/mail-mta/exim/files/exim-4.87-as-needed-ldflags.patch
similarity index 85%
rename from mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch
rename to mail-mta/exim/files/exim-4.87-as-needed-ldflags.patch
index 4eac9aa..e438485 100644
--- a/mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch
+++ b/mail-mta/exim/files/exim-4.87-as-needed-ldflags.patch
@@ -11,9 +11,9 @@ Use LDFLAGS for all targets, not just the exim binary, such
that
--- OS/Makefile-Base
+++ OS/Makefile-Base
-@@ -327,12 +327,12 @@
- $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)
version.c
- rm -f exim
+@@ -325,12 +325,12 @@
+ buildrouters buildtransports \
+ $(OBJ_EXIM) version.o
@echo "$(LNCC) -o exim"
- $(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
+ $(FE)$(PURIFY) $(LNCC) -o exim $(LDFLAGS) $(OBJ_EXIM) version.o \
@@ -26,7 +26,7 @@ Use LDFLAGS for all targets, not just the exim binary, such
that
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
echo $(STRIP_COMMAND) exim; \
$(STRIP_COMMAND) exim; \
-@@ -340,8 +340,8 @@
+@@ -346,8 +346,8 @@
exim_dumpdb: $(OBJ_DUMPDB)
@echo "$(LNCC) -o exim_dumpdb"
@@ -37,9 +37,9 @@ Use LDFLAGS for all targets, not just the exim binary, such
that
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
echo $(STRIP_COMMAND) exim_dumpdb; \
$(STRIP_COMMAND) exim_dumpdb; \
-@@ -355,8 +355,8 @@
+@@ -361,8 +361,8 @@
- exim_fixdb: $(OBJ_FIXDB) auths/auths.a
+ exim_fixdb: $(OBJ_FIXDB) buildauths
@echo "$(LNCC) -o exim_fixdb"
- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LFLAGS) $(OBJ_FIXDB) \
- auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB)
@@ -48,7 +48,7 @@ Use LDFLAGS for all targets, not just the exim binary, such
that
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
echo $(STRIP_COMMAND) exim_fixdb; \
$(STRIP_COMMAND) exim_fixdb; \
-@@ -370,8 +370,8 @@
+@@ -376,8 +376,8 @@
exim_tidydb: $(OBJ_TIDYDB)
@echo "$(LNCC) -o exim_tidydb"
@@ -59,7 +59,7 @@ Use LDFLAGS for all targets, not just the exim binary, such
that
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
echo $(STRIP_COMMAND) exim_tidydb; \
$(STRIP_COMMAND) exim_tidydb; \
-@@ -383,8 +383,8 @@
+@@ -389,8 +389,8 @@
exim_dbmbuild: exim_dbmbuild.o
@echo "$(LNCC) -o exim_dbmbuild"
@@ -70,7 +70,7 @@ Use LDFLAGS for all targets, not just the exim binary, such
that
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
echo $(STRIP_COMMAND) exim_dbmbuild; \
$(STRIP_COMMAND) exim_dbmbuild; \
-@@ -398,8 +398,8 @@
+@@ -404,8 +404,8 @@
@echo "$(CC) exim_lock.c"
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) exim_lock.c
@echo "$(LNCC) -o exim_lock"
@@ -81,7 +81,7 @@ Use LDFLAGS for all targets, not just the exim binary, such
that
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
echo $(STRIP_COMMAND) exim_lock; \
$(STRIP_COMMAND) exim_lock; \
-@@ -429,9 +429,9 @@
+@@ -435,9 +435,9 @@
$(FE)$(CC) -o em_version.o -c \
$(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
@echo "$(LNCC) -o eximon.bin"
@@ -93,19 +93,19 @@ Use LDFLAGS for all targets, not just the exim binary, such
that
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
echo $(STRIP_COMMAND) eximon.bin; \
$(STRIP_COMMAND) eximon.bin; \
-@@ -706,9 +706,9 @@
+@@ -745,9 +745,9 @@
test_dbfn: config.h dbfn.c dummies.o sa-globals.o sa-os.o store.o \
- string.o tod.o version.o
+ string.o tod.o version.o utf8.o
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE dbfn.c
- $(LNCC) -o test_dbfn $(LFLAGS) dbfn.o \
+ $(LNCC) -o test_dbfn $(LDFLAGS) dbfn.o \
dummies.o sa-globals.o sa-os.o store.o string.o \
-- tod.o version.o $(LIBS) $(DBMLIB)
-+ tod.o version.o $(LIBS) $(DBMLIB) $(LFLAGS)
+- tod.o version.o utf8.o $(LIBS) $(DBMLIB) $(LDFLAGS)
++ tod.o version.o utf8.o $(LIBS) $(DBMLIB) $(LFLAGS)
rm -f dbfn.o
test_host: config.h child.c host.c dns.c dummies.c sa-globals.o os.o \
-@@ -717,28 +717,28 @@
+@@ -756,29 +756,29 @@
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST host.c
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dns.c
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dummies.c
@@ -116,29 +116,30 @@ Use LDFLAGS for all targets, not just the exim binary,
such that
+ tod.o tree.o $(LIBS) $(LIBRESOLV) $(LFLAGS)
rm -f child.o dummies.o host.o dns.o
- test_os: os.h os.c dummies.o sa-globals.o store.o string.o tod.o
+ test_os: os.h os.c dummies.o sa-globals.o store.o string.o tod.o utf8.o
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE os.c
- $(LNCC) -o test_os $(LFLAGS) os.o dummies.o \
-- sa-globals.o store.o string.o tod.o $(LIBS)
+- sa-globals.o store.o string.o tod.o utf8.o $(LIBS) $(LDFLAGS)
+ $(LNCC) -o test_os $(LDFLAGS) os.o dummies.o \
-+ sa-globals.o store.o string.o tod.o $(LIBS) $(LFLAGS)
++ sa-globals.o store.o string.o tod.o utf8.o $(LIBS) $(LFLAGS)
rm -f os.o
test_parse: config.h parse.c dummies.o sa-globals.o \
- store.o string.o tod.o version.o
+ store.o string.o tod.o version.o utf8.o
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE parse.c
- $(LNCC) -o test_parse $(LFLAGS) parse.o \
-- dummies.o sa-globals.o store.o string.o tod.o version.o
+ $(LNCC) -o test_parse $(LDFLAGS) parse.o \
-+ dummies.o sa-globals.o store.o string.o tod.o version.o $(LFLAGS)
+ dummies.o sa-globals.o store.o string.o tod.o version.o \
+- utf8.o $(LDFLAGS)
++ utf8.o $(LFLAGS)
rm -f parse.o
- test_string: config.h string.c dummies.o sa-globals.o store.o tod.o
+ test_string: config.h string.c dummies.o sa-globals.o store.o tod.o utf8.o
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE string.c
- $(LNCC) -o test_string $(LFLAGS) -DSTAND_ALONE string.o \
-- dummies.o sa-globals.o store.o tod.o $(LIBS)
+- dummies.o sa-globals.o store.o tod.o utf8.o $(LIBS) $(LDFLAGS)
+ $(LNCC) -o test_string $(LDFLAGS) -DSTAND_ALONE string.o \
-+ dummies.o sa-globals.o store.o tod.o $(LIBS) $(LFLAGS)
++ dummies.o sa-globals.o store.o tod.o utf8.o $(LIBS) $(LFLAGS)
rm -f string.o
# End
diff --git a/mail-mta/exim/files/exim.rc8 b/mail-mta/exim/files/exim.rc8
deleted file mode 100644
index 582d40d..0000000
--- a/mail-mta/exim/files/exim.rc8
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="reload"
-
-depend() {
- need logger
- use antivirus net
- provide mta
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --exec /usr/sbin/exim --pidfile
/run/${SVCNAME}.pid -- -C /etc/exim/${SVCNAME}.conf ${EXIM_OPTS:--bd -q15m}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --pidfile /run/${SVCNAME}.pid --name exim
- eend $?
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP --pidfile /run/${SVCNAME}.pid --name exim
- eend $?
-}
diff --git a/mail-mta/exim/files/exim.rc9 b/mail-mta/exim/files/exim.rc9
index f14d058..447de9c 100644
--- a/mail-mta/exim/files/exim.rc9
+++ b/mail-mta/exim/files/exim.rc9
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index c2146fb..8a96bf7 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -21,6 +21,7 @@
<use>
<flag name="dcc">Adds support for Distributed Checksum
Clearinghouse
(DCC)</flag>
+ <flag name="dane">Adds support for DNS-based Authentication of
Named Entities</flag>
<flag name="dkim">Adds support for DomainKeys Identified Mail
(DKIM)</flag>
<flag name="dnsdb">Adds support for a DNS search for a record
whose
