Merge tag '0.33.1'

notmuch 0.33.1 release

diff --git a/NEWS b/NEWS
index c6a372e70e2d13bf6b901bc740a47c11bd9c645b..ec28a7696d7d0a4d62de63add501a70e45250b3c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Notmuch 0.33.1 (2021-09-10)
+===========================
+
+General
+-------
+
+Replace the fully-qualified-domain-name of the host with "localhost"
+in the default email address.  This should fix two flaky subtests in
+T590-libconfig.
+
 Notmuch 0.33 (2021-09-03)
 =========================
 

diff --git a/bindings/python-cffi/version.txt b/bindings/python-cffi/version.txt
index 94b357edfe3177640d1f0327b6360ac35e796253..8df3f4592f507e86c3da35e48f326d8b2d8fb1c5 100644 (file)
--- a/bindings/python-cffi/version.txt
+++ b/bindings/python-cffi/version.txt
@@ -1 +1 @@
-0.33
+0.33.1

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index eaa3fce7180e437060731eca2c2d6ffcb992e4c6..27b651b194f1b83894f72f3ebb059bf280c05e10 100644 (file)
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.33'
+__VERSION__ = '0.33.1'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index cf400c2c2333e6c912109a0d8e6e48bef3cbd7c8..a985c505e2092dc2fcbef6f36954fdcfa47d8a92 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.33.1-1) unstable; urgency=medium
+
+  * Upstream fix for flaky tests in T590-libconfig
+
+ -- David Bremner <bremner@debian.org>  Fri, 10 Sep 2021 08:28:48 -0300
+
 notmuch (0.33-2) unstable; urgency=medium
 
   * Disable two flaky tests in T590-libconfig.

diff --git a/debian/rules b/debian/rules
index 1d25f9c310fa27493fcb3544bb85703e891460f0..fa0551a951906e686860d08a78c615f24af6e3b0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ override_dh_auto_configure:
                --localstatedir=/var
 
 override_dh_auto_test:
-       dh_auto_test -- V=1 NOTMUCH_SKIP_TESTS="libconfig.18 libconfig.31"
+       dh_auto_test -- V=1
 
 override_dh_auto_build:
        dh_auto_build -- V=1

diff --git a/lib/config.cc b/lib/config.cc
index 7ecc3c7b4ba25f9a65202b4bedc11056b954b600..8775b00af8396280792e4af7049973b873f35586 100644 (file)
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -543,25 +543,11 @@ _get_username_from_passwd_file (void *ctx)
 static const char *
 _get_email_from_passwd_file (void *ctx)
 {
-
-    char hostname[256];
-    struct hostent *hostent;
-    const char *domainname;
     char *email;
 
     char *username = _get_username_from_passwd_file (ctx);
 
-    gethostname (hostname, 256);
-    hostname[255] = '\0';
-
-    hostent = gethostbyname (hostname);
-    if (hostent && (domainname = strchr (hostent->h_name, '.')))
-       domainname += 1;
-    else
-       domainname = "(none)";
-
-    email = talloc_asprintf (ctx, "%s@%s.%s",
-                            username, hostname, domainname);
+    email = talloc_asprintf (ctx, "%s@localhost", username);
 
     talloc_free (username);
     return email;

diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
index 41f67baeceb02719802439cc9e0936e2f264f6dd..59b82a6f6a81069b9578c83cafd24a546f98a58b 100755 (executable)
--- a/test/T590-libconfig.sh
+++ b/test/T590-libconfig.sh
@@ -12,12 +12,10 @@ 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)
+        l = l.replace(user, "USERNAME", 1)
     elif l[:4] == "10: ":
         l = l.replace("'" + name, "'USER_FULL_NAME", 1)
     sys.stdout.write(l)
@@ -416,7 +414,7 @@ cat <<'EOF' >EXPECTED
 05: 'unread;inbox'
 06: ''
 07: 'true'
-08: 'USERNAME@FQDN'
+08: 'USERNAME@localhost'
 09: 'NULL'
 10: 'USER_FULL_NAME'
 11: '8000'
@@ -761,7 +759,7 @@ cat <<'EOF' >EXPECTED
 05: 'unread;inbox'
 06: ''
 07: 'true'
-08: 'USERNAME@FQDN'
+08: 'USERNAME@localhost'
 09: 'NULL'
 10: 'USER_FULL_NAME'
 11: '8000'

diff --git a/version.txt b/version.txt
index 94b357edfe3177640d1f0327b6360ac35e796253..8df3f4592f507e86c3da35e48f326d8b2d8fb1c5 100644 (file)
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.33
+0.33.1