summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Piotr Żołnowski <aidecoe@gentoo.org>2019-11-27 23:10:29 +0000
committerAmadeusz Piotr Żołnowski <aidecoe@gentoo.org>2019-11-27 23:11:53 +0000
commitc7b44fa58efd3f42ff1186459a63c8c27e64e419 (patch)
tree48e53bde569403fdd659adbf4175c30828ca11c9 /net-mail/notmuch/files
parentdev-python/keyring-19.2.0: Version bump, will add py38 after deps (diff)
downloadgentoo-c7b44fa58efd3f42ff1186459a63c8c27e64e419.tar.gz
gentoo-c7b44fa58efd3f42ff1186459a63c8c27e64e419.tar.bz2
gentoo-c7b44fa58efd3f42ff1186459a63c8c27e64e419.zip
net-mail/notmuch: Bump to 0.29.3
Remove 0.29.2-r1 as 0.29.3 has the backported patch and one more additional fix. Bug: https://bugs.gentoo.org/701350 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe@gentoo.org>
Diffstat (limited to 'net-mail/notmuch/files')
-rw-r--r--net-mail/notmuch/files/0.29.2-0001-notmuch-dump.c-Fix-output-file-being-closed-twice.patch20
-rw-r--r--net-mail/notmuch/files/0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch61
2 files changed, 61 insertions, 20 deletions
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
deleted file mode 100644
index cafef61ce75..00000000000
--- a/net-mail/notmuch/files/0.29.2-0001-notmuch-dump.c-Fix-output-file-being-closed-twice.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/notmuch-dump.c 2019-07-24 17:11:02.899384482 +0200
-+++ b/notmuch-dump.c 2019-07-24 17:12:08.100487117 +0200
-@@ -329,13 +329,15 @@
- }
- }
-
-- if (gzclose_w (output) != Z_OK) {
-+ ret = gzclose_w (output);
-+ if (ret) {
- fprintf (stderr, "Error closing %s: %s\n", name_for_error,
- gzerror (output, NULL));
- ret = EXIT_FAILURE;
- output = NULL;
- goto DONE;
-- }
-+ } else
-+ output = NULL;
-
- if (output_file_name) {
- ret = rename (tempname, output_file_name);
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
new file mode 100644
index 00000000000..e4722469595
--- /dev/null
+++ b/net-mail/notmuch/files/0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch
@@ -0,0 +1,61 @@
+From 59b5bfb6e2095c62925b31e087571506edae7956 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
+ <aidecoe@aidecoe.name>
+Date: Sun, 7 Jul 2019 11:33:09 +0100
+Subject: [PATCH] Use loopback IP address rather than name
+
+---
+ test/smtp-dummy.c | 8 ++++----
+ test/test-lib.sh | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
+index a7c1fe4f..822a986a 100644
+--- a/test/smtp-dummy.c
++++ b/test/smtp-dummy.c
+@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command)
+ fprintf (peer, "502 not implemented\r\n");
+ fflush (peer);
+ } else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
+- fprintf (peer, "250 localhost\r\n");
++ fprintf (peer, "250 127.0.0.1\r\n");
+ fflush (peer);
+ } else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 ||
+ STRNCMP_LITERAL (command, "RCPT TO:") == 0) {
+@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
+ size_t line_size;
+ ssize_t line_len;
+
+- fprintf (peer, "220 localhost smtp-dummy\r\n");
++ fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n");
+ fflush (peer);
+
+ while ((line_len = getline (&line, &line_size, peer)) != -1) {
+@@ -183,9 +183,9 @@ main (int argc, char *argv[])
+ goto DONE;
+ }
+
+- hostinfo = gethostbyname ("localhost");
++ hostinfo = gethostbyname ("127.0.0.1");
+ if (hostinfo == NULL) {
+- fprintf (stderr, "Unknown host: localhost\n");
++ fprintf (stderr, "Unknown host: 127.0.0.1\n");
+ ret = 1;
+ goto DONE;
+ }
+diff --git a/test/test-lib.sh b/test/test-lib.sh
+index 616cb674..dd887773 100644
+--- a/test/test-lib.sh
++++ b/test/test-lib.sh
+@@ -336,7 +336,7 @@ emacs_deliver_message ()
+ test_emacs \
+ "(let ((message-send-mail-function 'message-smtpmail-send-it)
+ (mail-host-address \"example.com\")
+- (smtpmail-smtp-server \"localhost\")
++ (smtpmail-smtp-server \"127.0.0.1\")
+ (smtpmail-smtp-service \"${smtp_dummy_port}\"))
+ (notmuch-mua-mail)
+ (message-goto-to)
+--
+2.19.2
+