| 1 |
commit: c7b44fa58efd3f42ff1186459a63c8c27e64e419 |
| 2 |
Author: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 27 23:10:29 2019 +0000 |
| 4 |
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 27 23:11:53 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b44fa5 |
| 7 |
|
| 8 |
net-mail/notmuch: Bump to 0.29.3 |
| 9 |
|
| 10 |
Remove 0.29.2-r1 as 0.29.3 has the backported patch and one more |
| 11 |
additional fix. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/701350 |
| 14 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
| 15 |
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org> |
| 16 |
|
| 17 |
net-mail/notmuch/Manifest | 1 + |
| 18 |
...dump.c-Fix-output-file-being-closed-twice.patch | 20 ------- |
| 19 |
...-Use-loopback-IP-address-rather-than-name.patch | 61 ++++++++++++++++++++++ |
| 20 |
...much-0.29.2-r1.ebuild => notmuch-0.29.3.ebuild} | 1 - |
| 21 |
4 files changed, 62 insertions(+), 21 deletions(-) |
| 22 |
|
| 23 |
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest |
| 24 |
index fdfe821babe..8dc7ed23286 100644 |
| 25 |
--- a/net-mail/notmuch/Manifest |
| 26 |
+++ b/net-mail/notmuch/Manifest |
| 27 |
@@ -1,3 +1,4 @@ |
| 28 |
DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 |
| 29 |
DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7 |
| 30 |
DIST notmuch-0.29.2.tar.xz 660520 BLAKE2B f87889db5fa1049b2b91a9ea8abe917e5645860a5c163c73a57197ede904aa335c0f3b37cc2a7ff2465c30e94eb25b113bebd074aa9e92c84383457600e1de82 SHA512 0e345c4ecca8410eedb14154bcb3c327353a0984f30b7fd6c526deefcfe17aa74ca8fb4b4d28e93decca8c8914f7d60ca2c9485750001b14d67d7d33d4721bb3 |
| 31 |
+DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65 |
| 32 |
|
| 33 |
diff --git a/net-mail/notmuch/files/0.29.2-0001-notmuch-dump.c-Fix-output-file-being-closed-twice.patch b/net-mail/notmuch/files/0.29.2-0001-notmuch-dump.c-Fix-output-file-being-closed-twice.patch |
| 34 |
deleted file mode 100644 |
| 35 |
index cafef61ce75..00000000000 |
| 36 |
--- a/net-mail/notmuch/files/0.29.2-0001-notmuch-dump.c-Fix-output-file-being-closed-twice.patch |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,20 +0,0 @@ |
| 39 |
---- a/notmuch-dump.c 2019-07-24 17:11:02.899384482 +0200 |
| 40 |
-+++ b/notmuch-dump.c 2019-07-24 17:12:08.100487117 +0200 |
| 41 |
-@@ -329,13 +329,15 @@ |
| 42 |
- } |
| 43 |
- } |
| 44 |
- |
| 45 |
-- if (gzclose_w (output) != Z_OK) { |
| 46 |
-+ ret = gzclose_w (output); |
| 47 |
-+ if (ret) { |
| 48 |
- fprintf (stderr, "Error closing %s: %s\n", name_for_error, |
| 49 |
- gzerror (output, NULL)); |
| 50 |
- ret = EXIT_FAILURE; |
| 51 |
- output = NULL; |
| 52 |
- goto DONE; |
| 53 |
-- } |
| 54 |
-+ } else |
| 55 |
-+ output = NULL; |
| 56 |
- |
| 57 |
- if (output_file_name) { |
| 58 |
- ret = rename (tempname, output_file_name); |
| 59 |
|
| 60 |
diff --git a/net-mail/notmuch/files/0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch |
| 61 |
new file mode 100644 |
| 62 |
index 00000000000..e4722469595 |
| 63 |
--- /dev/null |
| 64 |
+++ b/net-mail/notmuch/files/0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch |
| 65 |
@@ -0,0 +1,61 @@ |
| 66 |
+From 59b5bfb6e2095c62925b31e087571506edae7956 Mon Sep 17 00:00:00 2001 |
| 67 |
+From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?= |
| 68 |
+ <aidecoe@×××××××.name> |
| 69 |
+Date: Sun, 7 Jul 2019 11:33:09 +0100 |
| 70 |
+Subject: [PATCH] Use loopback IP address rather than name |
| 71 |
+ |
| 72 |
+--- |
| 73 |
+ test/smtp-dummy.c | 8 ++++---- |
| 74 |
+ test/test-lib.sh | 2 +- |
| 75 |
+ 2 files changed, 5 insertions(+), 5 deletions(-) |
| 76 |
+ |
| 77 |
+diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c |
| 78 |
+index a7c1fe4f..822a986a 100644 |
| 79 |
+--- a/test/smtp-dummy.c |
| 80 |
++++ b/test/smtp-dummy.c |
| 81 |
+@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command) |
| 82 |
+ fprintf (peer, "502 not implemented\r\n"); |
| 83 |
+ fflush (peer); |
| 84 |
+ } else if (STRNCMP_LITERAL (command, "HELO ") == 0) { |
| 85 |
+- fprintf (peer, "250 localhost\r\n"); |
| 86 |
++ fprintf (peer, "250 127.0.0.1\r\n"); |
| 87 |
+ fflush (peer); |
| 88 |
+ } else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 || |
| 89 |
+ STRNCMP_LITERAL (command, "RCPT TO:") == 0) { |
| 90 |
+@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output) |
| 91 |
+ size_t line_size; |
| 92 |
+ ssize_t line_len; |
| 93 |
+ |
| 94 |
+- fprintf (peer, "220 localhost smtp-dummy\r\n"); |
| 95 |
++ fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n"); |
| 96 |
+ fflush (peer); |
| 97 |
+ |
| 98 |
+ while ((line_len = getline (&line, &line_size, peer)) != -1) { |
| 99 |
+@@ -183,9 +183,9 @@ main (int argc, char *argv[]) |
| 100 |
+ goto DONE; |
| 101 |
+ } |
| 102 |
+ |
| 103 |
+- hostinfo = gethostbyname ("localhost"); |
| 104 |
++ hostinfo = gethostbyname ("127.0.0.1"); |
| 105 |
+ if (hostinfo == NULL) { |
| 106 |
+- fprintf (stderr, "Unknown host: localhost\n"); |
| 107 |
++ fprintf (stderr, "Unknown host: 127.0.0.1\n"); |
| 108 |
+ ret = 1; |
| 109 |
+ goto DONE; |
| 110 |
+ } |
| 111 |
+diff --git a/test/test-lib.sh b/test/test-lib.sh |
| 112 |
+index 616cb674..dd887773 100644 |
| 113 |
+--- a/test/test-lib.sh |
| 114 |
++++ b/test/test-lib.sh |
| 115 |
+@@ -336,7 +336,7 @@ emacs_deliver_message () |
| 116 |
+ test_emacs \ |
| 117 |
+ "(let ((message-send-mail-function 'message-smtpmail-send-it) |
| 118 |
+ (mail-host-address \"example.com\") |
| 119 |
+- (smtpmail-smtp-server \"localhost\") |
| 120 |
++ (smtpmail-smtp-server \"127.0.0.1\") |
| 121 |
+ (smtpmail-smtp-service \"${smtp_dummy_port}\")) |
| 122 |
+ (notmuch-mua-mail) |
| 123 |
+ (message-goto-to) |
| 124 |
+-- |
| 125 |
+2.19.2 |
| 126 |
+ |
| 127 |
|
| 128 |
diff --git a/net-mail/notmuch/notmuch-0.29.2-r1.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild |
| 129 |
similarity index 98% |
| 130 |
rename from net-mail/notmuch/notmuch-0.29.2-r1.ebuild |
| 131 |
rename to net-mail/notmuch/notmuch-0.29.3.ebuild |
| 132 |
index 6edb84f72d2..e845830282d 100644 |
| 133 |
--- a/net-mail/notmuch/notmuch-0.29.2-r1.ebuild |
| 134 |
+++ b/net-mail/notmuch/notmuch-0.29.3.ebuild |
| 135 |
@@ -76,7 +76,6 @@ SITEFILE="50${PN}-gentoo.el" |
| 136 |
MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" |
| 137 |
PATCHES=( |
| 138 |
"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch |
| 139 |
- "${FILESDIR}"/${PV}-0001-notmuch-dump.c-Fix-output-file-being-closed-twice.patch |
| 140 |
) |
| 141 |
|
| 142 |
bindings() { |
Archives