From: David Bremner <david@tethera.net>
Date: Sat, 11 Sep 2021 00:02:10 +0000 (-0300)
Subject: Merge tag '0.33.1'
X-Git-Tag: archive/debian/0.34_rc0-1~22
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=7556bb7da27621895327b84d22abba2519c24ba7;hp=dc8262bd336f1c406e5705ec8cb5029f1bacd524

Merge tag '0.33.1'

notmuch 0.33.1 release
---

diff --git a/NEWS b/NEWS
index c6a372e7..ec28a769 100644
--- 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 94b357ed..8df3f459 100644
--- 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 eaa3fce7..27b651b1 100644
--- 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 cf400c2c..a985c505 100644
--- 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 1d25f9c3..fa0551a9 100755
--- 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 7ecc3c7b..8775b00a 100644
--- 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 41f67bae..59b82a6f 100755
--- 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 94b357ed..8df3f459 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.33
+0.33.1