diff options
Diffstat (limited to 'net-mail/notmuch')
| -rw-r--r-- | net-mail/notmuch/Manifest | 1 | ||||
| -rw-r--r-- | net-mail/notmuch/files/notmuch-0.32.1-tests.patch | 174 |
2 files changed, 0 insertions, 175 deletions
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest index aa1b98d65537..78528b3cba7b 100644 --- a/net-mail/notmuch/Manifest +++ b/net-mail/notmuch/Manifest @@ -1,5 +1,4 @@ AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b -AUX notmuch-0.32.1-tests.patch 4674 BLAKE2B c2eff70dcbf18a3276a97b3a9058f2a51647fddd6ef28ede2b1878aeb3ec3f6c5bfa5ac250c10f7cba3923031af3c4665a06190ab78b481448d9234e63e67594 SHA512 7870b5381b257cd9acc31c67f2654ecc711ddfde36c5f4a9969e43051eb43c1f0b716f926a85da4a8ec6c726bff1543cdcee9520e9b25eba2f8730bf206add5d AUX notmuch-0.37-configure-clang16.patch 703 BLAKE2B 4aa2c3f660021f6e1bf3d354559a3852e173e8a94701b5ac1da67254e9f87c58a309aff9e581a6aa7db8f8241ab38e1faac79e5d8cf99742069dd20fd990c880 SHA512 797139b680a7b02cd79eec9ceb1fdf79f6b4ec0efa3f52f0d297ecbceda2672d0647003b453f961e77e0e8f1f2a0caffb3d5e57d7d0bd11116df274eaa013e18 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 DIST notmuch-0.37.tar.xz 792568 BLAKE2B 0a968b776efc39ddc09bb2cb2721609fcdf65171978d285b6877abd4c3aa7d0221b25f1052a211be1864c57d961c7a1f0c9915fd9c65497a9e4bce3a2cdbc1c0 SHA512 31cac1ff03b139b18a4fec5e29907ba0e3a965f0a7bf5f2f2b0f75980f9663173745be854e83943f344a09cdb7f5615fa48218e327c4ade7a55b3a22b2a9c45e 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 |