| 1 |
commit: 8278ef6c1514eb7558e1ad23dced277a09c7fc51 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 12 07:51:10 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 12 07:51:10 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8278ef6c |
| 7 |
|
| 8 |
mail-mta/exim: version bump to Exim 4.89 RC4 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.3 |
| 11 |
|
| 12 |
mail-mta/exim/Manifest | 4 +- |
| 13 |
.../{exim-4.89_rc3.ebuild => exim-4.89_rc4.ebuild} | 2 +- |
| 14 |
.../exim/files/exim-4.89-as-needed-ldflags.patch | 145 +++++++++++++++++++++ |
| 15 |
3 files changed, 148 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest |
| 18 |
index 9f87ece7ac..d778435d68 100644 |
| 19 |
--- a/mail-mta/exim/Manifest |
| 20 |
+++ b/mail-mta/exim/Manifest |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
DIST exim-4.88.tar.bz2 1824610 SHA256 119d5fd7e31fc224e84dfa458fe182f200856bae7adf852a8287c242161f8a2d SHA512 ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf WHIRLPOOL d2d8c404217fcc5bbc7bc18500456f2709a099b0a31d4930343b836c35c62e3914fa1c686ea7d9ba5eea95f0caab13c3b76c1508eda74cb75dabb0d61472428e |
| 23 |
-DIST exim-4.89_RC3.tar.bz2 1840554 SHA256 f9db70feb2dfd074c407cc2960b21e63d57575fdc262f618322e247803f260fc SHA512 442baad509c72a51c06573516de490a425a1edfd69906ee3c33b07511f5a0d70314cd6d7cf2041f5578e71258689ac97d695b9040203c3a7a562b636d399b5b7 WHIRLPOOL 34302284f9fd0d48457719c4e75f608c95fb7daf679cbe15fd02c543effc0f577b991774cd59b9e0e8b7b25d9f4b91befbea099bf16ae9865d95363dfefdaa28 |
| 24 |
+DIST exim-4.89_RC4.tar.bz2 1840364 SHA256 e9de49cd7b874f944f827adbe2981fd3ea8eb000461856e94f5b7c859dde3df1 SHA512 efe8bc08713c1b47e6aa8b0964aa7d48a3a7ddf0332afa2c44b4ee2863511340176d074808cce0e06d45266eb07f52ab7ad980ff57b455d53b0b7bd25259e326 WHIRLPOOL 806b540a30dce26e1bc8b5baf4ed6b0e0ccbc5aa9922339d2e5895a2641cce1e28345c1d9ed4250efd296a8f987164ba0957cef595b7c93c5a6714c2fbb6fd3d |
| 25 |
DIST exim-pdf-4.88.tar.bz2 1922494 SHA256 33736fafb45c5922fcbc0def7626f46cb74927987b78943aa26949ef30789574 SHA512 8c4f580fa319c0285bcb49056ecd72b056cbbfa287a15a4d856965b4218469c85607ec7321ae0f2ba3be868f05a70a7fb8a77d5836a574417e6bffc64720bee5 WHIRLPOOL 7e3e65c58cc9a313d3440de6b79ed4f113ea265e39201aa2d36c091037c2b20718bd49f04e99f2aa029a20d238cd21178762e2ba6b470596309e83fb3ffc542b |
| 26 |
-DIST exim-pdf-4.89_RC3.tar.bz2 1924260 SHA256 93a34399096e1272ee8e4dcb6e3ec5bd09a7b084b14876e97e7685d97fa2c4bf SHA512 2504d7b482348ab67f6d9572ed4118c88e90ed44729267c05b769e6ae65ae42f28cb8095822a1e0588d1bcaf8b070e3e641b8fd8098c37656aa01ea2637ed343 WHIRLPOOL cb87c9d56a9b2a9a869484fe537daf9ee3dadc3469e22da1bc8523f838a22e263187d9b3493485301f13f44fca046fd3dd71079726077767802bc7eabcf4b821 |
| 27 |
+DIST exim-pdf-4.89_RC4.tar.bz2 1924453 SHA256 4b98d52873541e6675b3e7f6e433080033b0b2e0dece41ad273afedb6a6e17c0 SHA512 4438f8aae4dbee8c3422bfae0798536f73bae90377d9d1113b2ff2e005671767e78a9a5b3ffa64b0f0c2fe176ad55e3d2ff6c682b543f1d1a3f6460b4759adf4 WHIRLPOOL d5522cb831a037b2f668a522142384ad2efd414d235aba57a8c868b2578cc53e47215445828bb07a3a2e7c3841034824f3a388fe65d1dfcdcb3bb795e8d462e8 |
| 28 |
DIST system_filter.exim.gz 3075 SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 WHIRLPOOL ce68d9c18b24eca3ef97ea810964cc1ada5f85b795a7c432ad39b5788188a16419101c92fb52b418738d760e1d658f7a41485e5561079a667d84d276c71be5a4 |
| 29 |
|
| 30 |
diff --git a/mail-mta/exim/exim-4.89_rc3.ebuild b/mail-mta/exim/exim-4.89_rc4.ebuild |
| 31 |
similarity index 99% |
| 32 |
rename from mail-mta/exim/exim-4.89_rc3.ebuild |
| 33 |
rename to mail-mta/exim/exim-4.89_rc4.ebuild |
| 34 |
index 5deb3a88e3..e9c27b4082 100644 |
| 35 |
--- a/mail-mta/exim/exim-4.89_rc3.ebuild |
| 36 |
+++ b/mail-mta/exim/exim-4.89_rc4.ebuild |
| 37 |
@@ -93,7 +93,7 @@ src_prepare() { |
| 38 |
epatch "${FILESDIR}"/exim-4.69-r1.27021.patch |
| 39 |
epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426 |
| 40 |
epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785 |
| 41 |
- epatch "${FILESDIR}"/exim-4.88-as-needed-ldflags.patch # 352265, 391279 |
| 42 |
+ epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279 |
| 43 |
epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591 |
| 44 |
|
| 45 |
if use maildir ; then |
| 46 |
|
| 47 |
diff --git a/mail-mta/exim/files/exim-4.89-as-needed-ldflags.patch b/mail-mta/exim/files/exim-4.89-as-needed-ldflags.patch |
| 48 |
new file mode 100644 |
| 49 |
index 0000000000..49e430939f |
| 50 |
--- /dev/null |
| 51 |
+++ b/mail-mta/exim/files/exim-4.89-as-needed-ldflags.patch |
| 52 |
@@ -0,0 +1,145 @@ |
| 53 |
+https://bugs.gentoo.org/show_bug.cgi?id=352265 |
| 54 |
+ |
| 55 |
+Make sure LDFLAGS comes first, such that all libraries are considered, |
| 56 |
+and not discarded when --as-needed is in effect. |
| 57 |
+ |
| 58 |
+https://bugs.gentoo.org/show_bug.cgi?id=391279 |
| 59 |
+ |
| 60 |
+Use LDFLAGS for all targets, not just the exim binary, such that |
| 61 |
+--as-needed works as well. |
| 62 |
+ |
| 63 |
+ |
| 64 |
+--- OS/Makefile-Base |
| 65 |
++++ OS/Makefile-Base |
| 66 |
+@@ -346,12 +346,12 @@ |
| 67 |
+ buildrouters buildtransports \ |
| 68 |
+ $(OBJ_EXIM) version.o |
| 69 |
+ @echo "$(LNCC) -o exim" |
| 70 |
+- $(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \ |
| 71 |
++ $(FE)$(PURIFY) $(LNCC) -o exim $(LDFLAGS) $(OBJ_EXIM) version.o \ |
| 72 |
+ routers/routers.a transports/transports.a lookups/lookups.a \ |
| 73 |
+ auths/auths.a pdkim/pdkim.a \ |
| 74 |
+ $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \ |
| 75 |
+ $(EXTRALIBS_EXIM) $(DBMLIB) $(LOOKUP_LIBS) $(AUTH_LIBS) \ |
| 76 |
+- $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LDFLAGS) |
| 77 |
++ $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LFLAGS) |
| 78 |
+ @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
| 79 |
+ echo $(STRIP_COMMAND) exim; \ |
| 80 |
+ $(STRIP_COMMAND) exim; \ |
| 81 |
+@@ -367,8 +367,8 @@ |
| 82 |
+ |
| 83 |
+ exim_dumpdb: $(OBJ_DUMPDB) |
| 84 |
+ @echo "$(LNCC) -o exim_dumpdb" |
| 85 |
+- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LFLAGS) $(OBJ_DUMPDB) \ |
| 86 |
+- $(LIBS) $(EXTRALIBS) $(DBMLIB) |
| 87 |
++ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LDFLAGS) $(OBJ_DUMPDB) \ |
| 88 |
++ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) |
| 89 |
+ @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
| 90 |
+ echo $(STRIP_COMMAND) exim_dumpdb; \ |
| 91 |
+ $(STRIP_COMMAND) exim_dumpdb; \ |
| 92 |
+@@ -382,8 +382,8 @@ |
| 93 |
+ |
| 94 |
+ exim_fixdb: $(OBJ_FIXDB) buildauths |
| 95 |
+ @echo "$(LNCC) -o exim_fixdb" |
| 96 |
+- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LFLAGS) $(OBJ_FIXDB) \ |
| 97 |
+- auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB) |
| 98 |
++ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LDFLAGS) $(OBJ_FIXDB) \ |
| 99 |
++ auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) |
| 100 |
+ @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
| 101 |
+ echo $(STRIP_COMMAND) exim_fixdb; \ |
| 102 |
+ $(STRIP_COMMAND) exim_fixdb; \ |
| 103 |
+@@ -397,8 +397,8 @@ |
| 104 |
+ |
| 105 |
+ exim_tidydb: $(OBJ_TIDYDB) |
| 106 |
+ @echo "$(LNCC) -o exim_tidydb" |
| 107 |
+- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) $(OBJ_TIDYDB) \ |
| 108 |
+- $(LIBS) $(EXTRALIBS) $(DBMLIB) |
| 109 |
++ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LDFLAGS) $(OBJ_TIDYDB) \ |
| 110 |
++ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) |
| 111 |
+ @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
| 112 |
+ echo $(STRIP_COMMAND) exim_tidydb; \ |
| 113 |
+ $(STRIP_COMMAND) exim_tidydb; \ |
| 114 |
+@@ -410,8 +410,8 @@ |
| 115 |
+ |
| 116 |
+ exim_dbmbuild: exim_dbmbuild.o |
| 117 |
+ @echo "$(LNCC) -o exim_dbmbuild" |
| 118 |
+- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LFLAGS) exim_dbmbuild.o \ |
| 119 |
+- $(LIBS) $(EXTRALIBS) $(DBMLIB) |
| 120 |
++ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LDFLAGS) exim_dbmbuild.o \ |
| 121 |
++ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) |
| 122 |
+ @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
| 123 |
+ echo $(STRIP_COMMAND) exim_dbmbuild; \ |
| 124 |
+ $(STRIP_COMMAND) exim_dbmbuild; \ |
| 125 |
+@@ -425,8 +425,8 @@ |
| 126 |
+ @echo "$(CC) exim_lock.c" |
| 127 |
+ $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) exim_lock.c |
| 128 |
+ @echo "$(LNCC) -o exim_lock" |
| 129 |
+- $(FE)$(LNCC) -o exim_lock $(LFLAGS) exim_lock.o \ |
| 130 |
+- $(LIBS) $(EXTRALIBS) |
| 131 |
++ $(FE)$(LNCC) -o exim_lock $(LDFLAGS) exim_lock.o \ |
| 132 |
++ $(LIBS) $(EXTRALIBS) $(LFLAGS) |
| 133 |
+ @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
| 134 |
+ echo $(STRIP_COMMAND) exim_lock; \ |
| 135 |
+ $(STRIP_COMMAND) exim_lock; \ |
| 136 |
+@@ -462,9 +462,9 @@ |
| 137 |
+ $(FE)$(CC) -o em_version.o -c \ |
| 138 |
+ $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c |
| 139 |
+ @echo "$(LNCC) -o eximon.bin" |
| 140 |
+- $(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \ |
| 141 |
++ $(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LDFLAGS) $(XLFLAGS) \ |
| 142 |
+ $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 $(PCRE_LIBS) \ |
| 143 |
+- $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc |
| 144 |
++ $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc $(LFLAGS) |
| 145 |
+ @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
| 146 |
+ echo $(STRIP_COMMAND) eximon.bin; \ |
| 147 |
+ $(STRIP_COMMAND) eximon.bin; \ |
| 148 |
+@@ -780,9 +780,9 @@ |
| 149 |
+ string.o tod.o version.o utf8.o |
| 150 |
+ $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE dbfn.c |
| 151 |
+ $(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY store.c |
| 152 |
+- $(LNCC) -o test_dbfn $(LFLAGS) dbfn.o \ |
| 153 |
++ $(LNCC) -o test_dbfn $(LDFLAGS) dbfn.o \ |
| 154 |
+ dummies.o sa-globals.o sa-os.o store.o string.o \ |
| 155 |
+- tod.o version.o utf8.o $(LIBS) $(DBMLIB) $(LDFLAGS) |
| 156 |
++ tod.o version.o utf8.o $(LIBS) $(DBMLIB) $(LFLAGS) |
| 157 |
+ rm -f dbfn.o store.o |
| 158 |
+ |
| 159 |
+ test_host: config.h child.c host.c dns.c dummies.c sa-globals.o os.o \ |
| 160 |
+@@ -790,29 +790,29 @@ |
| 161 |
+ $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST host.c |
| 162 |
+ $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dns.c |
| 163 |
+ $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dummies.c |
| 164 |
+- $(LNCC) -o test_host $(LFLAGS) \ |
| 165 |
++ $(LNCC) -o test_host $(LDFLAGS) \ |
| 166 |
+ host.o child.o dns.o dummies.o sa-globals.o os.o store.o string.o \ |
| 167 |
+- tod.o tree.o $(LIBS) $(LIBRESOLV) |
| 168 |
++ tod.o tree.o $(LIBS) $(LIBRESOLV) $(LFLAGS) |
| 169 |
+ rm -f child.o dummies.o host.o dns.o |
| 170 |
+ |
| 171 |
+ test_os: os.h os.c dummies.o sa-globals.o store.o string.o tod.o utf8.o |
| 172 |
+ $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE os.c |
| 173 |
+- $(LNCC) -o test_os $(LFLAGS) os.o dummies.o \ |
| 174 |
+- sa-globals.o store.o string.o tod.o utf8.o $(LIBS) $(LDFLAGS) |
| 175 |
++ $(LNCC) -o test_os $(LDFLAGS) os.o dummies.o \ |
| 176 |
++ sa-globals.o store.o string.o tod.o utf8.o $(LIBS) $(LFLAGS) |
| 177 |
+ rm -f os.o |
| 178 |
+ |
| 179 |
+ test_parse: config.h parse.c dummies.o sa-globals.o \ |
| 180 |
+ store.o string.o tod.o version.o utf8.o |
| 181 |
+ $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE parse.c |
| 182 |
+- $(LNCC) -o test_parse $(LFLAGS) parse.o \ |
| 183 |
++ $(LNCC) -o test_parse $(LDFLAGS) parse.o \ |
| 184 |
+ dummies.o sa-globals.o store.o string.o tod.o version.o \ |
| 185 |
+- utf8.o $(LDFLAGS) |
| 186 |
++ utf8.o $(LFLAGS) |
| 187 |
+ rm -f parse.o |
| 188 |
+ |
| 189 |
+ test_string: config.h string.c dummies.o sa-globals.o store.o tod.o utf8.o |
| 190 |
+ $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE string.c |
| 191 |
+- $(LNCC) -o test_string $(LFLAGS) -DSTAND_ALONE string.o \ |
| 192 |
+- dummies.o sa-globals.o store.o tod.o utf8.o $(LIBS) $(LDFLAGS) |
| 193 |
++ $(LNCC) -o test_string $(LDFLAGS) -DSTAND_ALONE string.o \ |
| 194 |
++ dummies.o sa-globals.o store.o tod.o utf8.o $(LIBS) $(LFLAGS) |
| 195 |
+ rm -f string.o |
| 196 |
+ |
| 197 |
+ # End |
Archives