Control: tags -1 + pending Hi,
Today I uploaded the non-maintainer version 1.8.11-2.1 to the DELAYED/2 queue for unstable. [1] The purpose was to bring msmtpd in bullseye into conformance with RFC821, which states that "Commands and replies are not case sensitive." [2] (Later standards such as RFC5321 employ similar language.) The upload will close this bug, which I marked pending. The upstream commit 7d2222cf that was cherry-picked here was accepted upstream over a year ago. [3] The debdiff showing the changes in the new source package was copied to the bottom of this message. Thank you for maintaining msmtp in Debian! Kind regards, Felix Lechner [1] https://ftp-master.debian.org/deferred.html [2] https://tools.ietf.org/html/rfc821 [3] https://github.com/marlam/msmtp-mirror/commit/7d2222cfd522efc13fde4df448d834bc6ba2b205 * * * diff -Nru msmtp-1.8.11/debian/changelog msmtp-1.8.11/debian/changelog --- msmtp-1.8.11/debian/changelog 2020-08-20 07:24:11.000000000 -0700 +++ msmtp-1.8.11/debian/changelog 2021-03-18 09:01:45.000000000 -0700 @@ -1,3 +1,12 @@ +msmtp (1.8.11-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Cherry-pick 7d2222cf from upstream for the bullseye release. Brings + msmtp into conformance with RFC821, which states that "Commands and + replies are not case sensitive." (Closes #985468) + + -- Felix Lechner <[email protected]> Thu, 18 Mar 2021 09:01:45 -0700 + msmtp (1.8.11-2) unstable; urgency=medium * Fix build options to re-enable TLS support via GnuTLS, IDN and SASL. diff -Nru msmtp-1.8.11/debian/patches/7d2222cfd522efc13fde4df448d834bc6ba2b205-adjusted.diff msmtp-1.8.11/debian/patches/7d2222cfd522efc13fde4df448d834bc6ba2b205-adjusted.diff --- msmtp-1.8.11/debian/patches/7d2222cfd522efc13fde4df448d834bc6ba2b205-adjusted.diff 1969-12-31 16:00:00.000000000 -0800 +++ msmtp-1.8.11/debian/patches/7d2222cfd522efc13fde4df448d834bc6ba2b205-adjusted.diff 2021-03-18 09:01:45.000000000 -0700 @@ -0,0 +1,70 @@ +Description: Cherry-pick 7d2222cf from upstream for bullseye, adjusted +Author: Felix Lechner <[email protected]> +Origin: https://github.com/marlam/msmtp-mirror/commit/7d2222cfd522efc13fde4df448d834bc6ba2b205.diff +Bug: https://github.com/marlam/msmtp-mirror/issues/45 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/msmtpd.c ++++ b/src/msmtpd.c +@@ -26,6 +26,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <strings.h> + #include <errno.h> + #include <unistd.h> + #include <signal.h> +@@ -186,18 +187,18 @@ int msmtpd_session(FILE* in, FILE* out, + fprintf(out, "220 localhost ESMTP msmtpd\r\n"); + if (read_smtp_cmd(in, buf, SMTP_BUFSIZE) != 0) + return 1; +- if (strncmp(buf, "EHLO ", 5) != 0 && strncmp(buf, "HELO ", 5) != 0) { ++ if (strncasecmp(buf, "EHLO ", 5) != 0 && strncasecmp(buf, "HELO ", 5) != 0) { + fprintf(out, "500 Expected EHLO or HELO\r\n"); + return 1; + } + fprintf(out, "250 localhost\r\n"); + if (read_smtp_cmd(in, buf, SMTP_BUFSIZE) != 0) + return 1; +- if (strncmp(buf, "MAIL FROM:", 10) != 0 && strcmp(buf, "QUIT") != 0) { ++ if (strncasecmp(buf, "MAIL FROM:", 10) != 0 && strcasecmp(buf, "QUIT") != 0) { + fprintf(out, "500 Expected MAIL FROM:<addr> or QUIT\r\n"); + return 1; + } +- if (strcmp(buf, "QUIT") == 0) { ++ if (strcasecmp(buf, "QUIT") == 0) { + fprintf(out, "221 Bye\r\n"); + return 0; + } +@@ -235,19 +236,19 @@ int msmtpd_session(FILE* in, FILE* out, + return 1; + } + if (!recipient_was_seen) { +- if (strncmp(buf, "RCPT TO:", 8) != 0) { ++ if (strncasecmp(buf, "RCPT TO:", 8) != 0) { + fprintf(out, "500 Expected RCPT TO:<addr>\r\n"); + free(cmd); + return 1; + } + } else { +- if (strncmp(buf, "RCPT TO:", 8) != 0 && strcmp(buf, "DATA") != 0) { ++ if (strncasecmp(buf, "RCPT TO:", 8) != 0 && strcasecmp(buf, "DATA") != 0) { + fprintf(out, "500 Expected RCPT TO:<addr> or DATA\r\n"); + free(cmd); + return 1; + } + } +- if (strcmp(buf, "DATA") == 0) { ++ if (strcasecmp(buf, "DATA") == 0) { + break; + } else { + if (get_addr(buf + 8, addrbuf, 0, &addrlen) != 0) { +@@ -302,7 +303,7 @@ int msmtpd_session(FILE* in, FILE* out, + fprintf(out, "250 Ok, mail was piped\r\n"); + if (read_smtp_cmd(in, buf, SMTP_BUFSIZE) != 0) + return 0; /* ignore missing QUIT */ +- if (strcmp(buf, "QUIT") != 0) { ++ if (strcasecmp(buf, "QUIT") != 0) { + fprintf(out, "500 Expected QUIT\r\n"); + return 1; + } diff -Nru msmtp-1.8.11/debian/patches/series msmtp-1.8.11/debian/patches/series --- msmtp-1.8.11/debian/patches/series 2020-04-23 07:36:12.000000000 -0700 +++ msmtp-1.8.11/debian/patches/series 2021-03-18 09:01:45.000000000 -0700 @@ -1 +1,2 @@ +7d2222cfd522efc13fde4df448d834bc6ba2b205-adjusted.diff fix_typo_manapge
