diff options
| author | Andreas Beckmann <anbe@debian.org> | 2014-05-23 19:23:11 +0200 |
|---|---|---|
| committer | Andreas Beckmann <anbe@debian.org> | 2014-05-23 19:23:11 +0200 |
| commit | 9fbc40c13f4c379ddc81aacc105350d621967445 (patch) | |
| tree | a912c93e8404b421ee3500f67656d3aab9b34ec9 | |
| parent | b804b8b5016dd3e60936446215e2505e3316dfc7 (diff) | |
| download | sendmail-9fbc40c13f4c379ddc81aacc105350d621967445.tar.gz | |
fix wrong assertion in libmilter
backported from 8.14.7
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.4/libmilter-assert.patch | 15 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.4/series | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 4f0a720..9dd0505 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ sendmail (8.14.4-6) UNRELEASED; urgency=medium * Add support for OpenSSL options SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2 (backported from 8.14.8), thanks to David F. Skoll. (Closes: #747910) * Apply manpage corrections from Ubuntu. (Closes: #747551) + * libmilter-assert.patch: Fix an incorrect assertion in libmilter, + cherry-picked from sendmail 8.14.7. (LP: #1299571) * libmilter: Convert into a 'Multi-Arch: same' package. * libmilter: Add symbols control file. * libmilter-dev: Move static libraries from /usr/lib/libmilter to /usr/lib. diff --git a/debian/patches/8.14/8.14.4/libmilter-assert.patch b/debian/patches/8.14/8.14.4/libmilter-assert.patch new file mode 100644 index 0000000..9a83683 --- /dev/null +++ b/debian/patches/8.14/8.14.4/libmilter-assert.patch @@ -0,0 +1,15 @@ +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sendmail/+bug/1299571 + +--- sendmail-8.14.4/libmilter/worker.c 2009-06-15 17:34:54.000000000 +0200 ++++ sendmail-8.14.8/libmilter/worker.c 2013-11-22 21:51:37.000000000 +0100 +@@ -165,7 +166,9 @@ + { + static long id = 0; + +- SM_ASSERT(Tskmgr.tm_signature == TM_SIGNATURE); ++ /* this can happen if the milter is shutting down */ ++ if (Tskmgr.tm_signature != TM_SIGNATURE) ++ return MI_FAILURE; + SM_ASSERT(ctx != NULL); + POOL_LEV_DPRINTF(4, ("PIPE r=[%d] w=[%d]", RD_PIPE, WR_PIPE)); + TASKMGR_LOCK(); diff --git a/debian/patches/8.14/8.14.4/series b/debian/patches/8.14/8.14.4/series index b0fe181..7c05e53 100644 --- a/debian/patches/8.14/8.14.4/series +++ b/debian/patches/8.14/8.14.4/series @@ -20,3 +20,4 @@ _ffr_tls_ec.patch ssl_op_no_tlsv1_x.patch install_static_libs.patch shared_libmilter.patch +libmilter-assert.patch |