[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/

[David Seifert]

commit:     8b6596f187991bfe593096f79706cf00558586ba
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jan 20 06:38:17 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 20:20:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6596f1

net-mail/notmuch: remove unused patch/file

Closes: https://github.com/gentoo/gentoo/pull/3558

 ...01-test-exit-with-nonzero-value-when-not-.patch | 56 ----------------------
 net-mail/notmuch/files/60notmuch-pick-gentoo.el    |  1 -
 2 files changed, 57 deletions(-)

diff --git a/net-mail/notmuch/files/0.16-0001-test-exit-with-nonzero-value-when-not-.patch b/net-mail/notmuch/files/0.16-0001-test-exit-with-nonzero-value-when-not-.patch
deleted file mode 100644
index f66a124..00000000
--- a/net-mail/notmuch/files/0.16-0001-test-exit-with-nonzero-value-when-not-.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c1f05bfb791e82776f5759e38c758cedd7e6190f Mon Sep 17 00:00:00 2001
-From: Tomi Ollila <tomi.ollila@iki.fi>
-Date: Sun, 8 Sep 2013 18:53:30 +0300
-Subject: [PATCH] test: exit with nonzero value when not all tests completed
- successfully
-
-If any of the tests in our test system is not passing the execution
-of the test suite completes with nonzero exit value.
-
-It is better to rely on the exit value of the test system instead
-of some arbitrary strings in test output (or use both).
----
- test/aggregate-results.sh | 9 +++++++++
- test/notmuch-test         | 3 +++
- 2 files changed, 12 insertions(+)
-
-diff --git a/test/aggregate-results.sh b/test/aggregate-results.sh
-index 732d6ca..b016edb 100755
---- a/test/aggregate-results.sh
-+++ b/test/aggregate-results.sh
-@@ -1,5 +1,7 @@
- #!/usr/bin/env bash
- 
-+set -eu
-+
- fixed=0
- success=0
- failed=0
-@@ -79,3 +81,10 @@ if [ "$skipped" != "0" ]; then
-     tests=$(pluralize "test" $skipped)
-     echo "$skipped $tests skipped."
- fi
-+
-+if [ $success -gt 0 -a $fixed -eq 0 -a $failed -eq 0 -a $skipped -eq 0 ]
-+then
-+    exit 0
-+else
-+    exit 1
-+fi
-diff --git a/test/notmuch-test b/test/notmuch-test
-index 6db7979..aa28bb0 100755
---- a/test/notmuch-test
-+++ b/test/notmuch-test
-@@ -97,6 +97,9 @@ trap - HUP INT TERM
- 
- # Report results
- ./aggregate-results.sh test-results/*
-+ev=$?
- 
- # Clean up
- rm -rf test-results corpus.mail
-+
-+exit $ev
--- 
-1.8.3.2
-

diff --git a/net-mail/notmuch/files/60notmuch-pick-gentoo.el b/net-mail/notmuch/files/60notmuch-pick-gentoo.el
deleted file mode 100644
index 84ef4b4..00000000
--- a/net-mail/notmuch/files/60notmuch-pick-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(autoload 'notmuch-pick "notmuch-pick" "Run notmuch pick with the given `query' and display the results" t)

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/

[Amadeusz Piotr Żołnowski]

commit:     98647e26432c86554baf653ecf58a129fdf0b9ce
Author:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 22:03:25 2019 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 22:04:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98647e26

net-mail/notmuch: Add missing patch for 0.29.2

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>

 ...-Use-loopback-IP-address-rather-than-name.patch | 61 ++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0.29.2-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.2-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
+

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/

[Conrad Kostecki]

commit:     fbffb06dd2dfb51b6656dcf74caecbc6bbea2b38
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue May 16 16:11:22 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May 22 21:26:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbffb06d

net-mail/notmuch: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31064
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-mail/notmuch/files/notmuch-0.32.1-tests.patch | 174 ----------------------
 1 file changed, 174 deletions(-)

diff --git a/net-mail/notmuch/files/notmuch-0.32.1-tests.patch b/net-mail/notmuch/files/notmuch-0.32.1-tests.patch
deleted file mode 100644
index 8a5643254856..000000000000
--- a/net-mail/notmuch/files/notmuch-0.32.1-tests.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From: Tomi Ollila <tomi.ollila@iki.fi>
-Date: Sat, 22 May 2021 13:39:57 +0000 (+0300)
-Subject: test: replace notmuch_passwd_sanitize() with _libconfig_sanitize()
-X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=8675be1d307bc2df882107744641f6a7858e65ad;hp=3baa61e0e58402bc50c5df529fcf669bf4b2facb
-
-test: replace notmuch_passwd_sanitize() with _libconfig_sanitize()
-
-notmuch_passwd_sanitize() in test-lib.sh is too generic, it cannot
-work in many cases...
-
-The more specific version _libconfig_sanitize() replaces it in
-T590-libconfig.sh and the code that uses it is modified to output
-the keys (ascending numbers printed in hex) so the sanitizer knows
-what to sanitize in which lines...
-
-"@" + fqdn -> "@FQDN" replacement is used as fqdn could
--- in theory -- be substring of 'USERNAME'.
-
-'user -> 'USER_FULL_NAME replacement to work in cases where user
-is empty -- as only first ' is replaced that works as expected.
-
-In addition to ".(none)" now also ".localdomain" is filtered from
-USERNAME@FQDN.
-
-/dev/fd/{n} is not defined in posix, but it is portable enough
-(if it weren't it is easy to fix -- now code looks clearer).
----
-
-diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
-index 745e1bb4..bc7298f8 100755
---- a/test/T590-libconfig.sh
-+++ b/test/T590-libconfig.sh
-@@ -5,6 +5,25 @@ test_description="library config API"
- 
- add_email_corpus
- 
-+_libconfig_sanitize() {
-+    ${NOTMUCH_PYTHON} /dev/fd/3 3<<'EOF'
-+import os, sys, pwd, socket
-+
-+pw = pwd.getpwuid(os.getuid())
-+user = pw.pw_name
-+name = pw.pw_gecos.partition(",")[0]
-+fqdn = socket.getaddrinfo(socket.gethostname(), 0, 0,
-+                          socket.SOCK_STREAM, 0, socket.AI_CANONNAME)[0][3]
-+for l in sys.stdin:
-+    if l[:4] == "08: ":
-+        l = l.replace(user, "USERNAME", 1).replace("@" + fqdn, "@FQDN", 1)
-+        l = l.replace(".(none)", "", 1).replace(".localdomain", "", 1)
-+    elif l[:4] == "10: ":
-+        l = l.replace("'" + name, "'USER_FULL_NAME", 1)
-+    sys.stdout.write(l)
-+EOF
-+}
-+
- cat <<EOF > c_head
- #include <string.h>
- #include <stdlib.h>
-@@ -380,26 +399,26 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} '' %NULL%
- 	 key < NOTMUCH_CONFIG_LAST;
- 	 key = (notmuch_config_key_t)(key + 1)) {
- 	const char *val = notmuch_config_get (db, key);
--        printf("%s\n", val ? val : "NULL" );
-+	printf("%02d: '%s'\n", key, val ? val : "NULL" );
-     }
- }
- EOF
- 
--notmuch_passwd_sanitize < OUTPUT > OUTPUT.clean
-+_libconfig_sanitize < OUTPUT > OUTPUT.clean
- 
- cat <<'EOF' >EXPECTED
- == stdout ==
--MAIL_DIR
--MAIL_DIR
--MAIL_DIR/.notmuch/hooks
--MAIL_DIR/.notmuch/backups
--
--unread;inbox
--
--true
--USERNAME@FQDN
--NULL
--USER_FULL_NAME
-+00: 'MAIL_DIR'
-+01: 'MAIL_DIR'
-+02: 'MAIL_DIR/.notmuch/hooks'
-+03: 'MAIL_DIR/.notmuch/backups'
-+04: ''
-+05: 'unread;inbox'
-+06: ''
-+07: 'true'
-+08: 'USERNAME@FQDN'
-+09: 'NULL'
-+10: 'USER_FULL_NAME'
- == stderr ==
- EOF
- unset MAILDIR
-@@ -694,23 +713,23 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
- 	 key < NOTMUCH_CONFIG_LAST;
- 	 key = (notmuch_config_key_t)(key + 1)) {
- 	const char *val = notmuch_config_get (db, key);
--        printf("%s\n", val ? val : "NULL" );
-+	printf("%x: '%s'\n", key, val ? val : "NULL" );
-     }
- }
- EOF
- cat <<'EOF' >EXPECTED
- == stdout ==
--MAIL_DIR
--MAIL_DIR
--MAIL_DIR/.notmuch/hooks
--MAIL_DIR/.notmuch/backups
--foo;bar;fub
--unread;inbox
--sekrit_junk
--true
--test_suite@notmuchmail.org
--test_suite_other@notmuchmail.org;test_suite@otherdomain.org
--Notmuch Test Suite
-+0: 'MAIL_DIR'
-+1: 'MAIL_DIR'
-+2: 'MAIL_DIR/.notmuch/hooks'
-+3: 'MAIL_DIR/.notmuch/backups'
-+4: 'foo;bar;fub'
-+5: 'unread;inbox'
-+6: 'sekrit_junk'
-+7: 'true'
-+8: 'test_suite@notmuchmail.org'
-+9: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org'
-+a: 'Notmuch Test Suite'
- == stderr ==
- EOF
- test_expect_equal_file EXPECTED OUTPUT
-@@ -723,25 +742,26 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} /nonexistent %NULL%
- 	 key < NOTMUCH_CONFIG_LAST;
- 	 key = (notmuch_config_key_t)(key + 1)) {
- 	const char *val = notmuch_config_get (db, key);
--	printf("%s\n", val ? val : "NULL" );
-+	printf("%02d: '%s'\n", key, val ? val : "NULL" );
-     }
- }
- EOF
- 
--notmuch_passwd_sanitize < OUTPUT > OUTPUT.clean
-+_libconfig_sanitize < OUTPUT > OUTPUT.clean
-+
- cat <<'EOF' >EXPECTED
- == stdout ==
--MAIL_DIR
--MAIL_DIR
--MAIL_DIR/.notmuch/hooks
--MAIL_DIR/.notmuch/backups
--
--unread;inbox
--
--true
--USERNAME@FQDN
--NULL
--USER_FULL_NAME
-+00: 'MAIL_DIR'
-+01: 'MAIL_DIR'
-+02: 'MAIL_DIR/.notmuch/hooks'
-+03: 'MAIL_DIR/.notmuch/backups'
-+04: ''
-+05: 'unread;inbox'
-+06: ''
-+07: 'true'
-+08: 'USERNAME@FQDN'
-+09: 'NULL'
-+10: 'USER_FULL_NAME'
- == stderr ==
- EOF
- test_expect_equal_file EXPECTED OUTPUT.clean