+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)
=========================
# this file should be kept in sync with ../../../version
-__VERSION__ = '0.33'
+__VERSION__ = '0.33.1'
SOVERSION = '5'
+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.
--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
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;
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)
05: 'unread;inbox'
06: ''
07: 'true'
-08: 'USERNAME@FQDN'
+08: 'USERNAME@localhost'
09: 'NULL'
10: 'USER_FULL_NAME'
11: '8000'
05: 'unread;inbox'
06: ''
07: 'true'
-08: 'USERNAME@FQDN'
+08: 'USERNAME@localhost'
09: 'NULL'
10: 'USER_FULL_NAME'
11: '8000'