diff --git a/sendmail-8.16.0.29-fix-covscan-issues.patch b/sendmail-8.15.2-fix-covscan-issues.patch similarity index 81% rename from sendmail-8.16.0.29-fix-covscan-issues.patch rename to sendmail-8.15.2-fix-covscan-issues.patch index 99f7216..9cb1f34 100644 --- a/sendmail-8.16.0.29-fix-covscan-issues.patch +++ b/sendmail-8.15.2-fix-covscan-issues.patch @@ -27,10 +27,10 @@ index 87c353c..c99d4e5 100644 sm_free(argtable); return sm_error(fp) ? SM_IO_EOF : ret; diff --git a/sendmail/milter.c b/sendmail/milter.c -index 462efd2..af6dc66 100644 +index 9b3667d..190bf9f 100644 --- a/sendmail/milter.c +++ b/sendmail/milter.c -@@ -2437,8 +2437,7 @@ milter_negotiate(m, e, milters) +@@ -2441,8 +2441,7 @@ milter_negotiate(m, e, milters) sm_syslog(LOG_ERR, e->e_id, "Milter (%s): negotiate: returned %c instead of %c", m->mf_name, rcmd, SMFIC_OPTNEG); @@ -40,7 +40,7 @@ index 462efd2..af6dc66 100644 milter_error(m, e); return -1; } -@@ -2453,8 +2452,7 @@ milter_negotiate(m, e, milters) +@@ -2457,8 +2456,7 @@ milter_negotiate(m, e, milters) sm_syslog(LOG_ERR, e->e_id, "Milter (%s): negotiate: did not return valid info", m->mf_name); @@ -50,7 +50,7 @@ index 462efd2..af6dc66 100644 milter_error(m, e); return -1; } -@@ -2472,8 +2470,7 @@ milter_negotiate(m, e, milters) +@@ -2476,8 +2474,7 @@ milter_negotiate(m, e, milters) sm_syslog(LOG_ERR, e->e_id, "Milter (%s): negotiate: did not return enough info", m->mf_name); @@ -60,7 +60,7 @@ index 462efd2..af6dc66 100644 milter_error(m, e); return -1; } -@@ -2589,11 +2586,11 @@ milter_negotiate(m, e, milters) +@@ -2593,11 +2590,11 @@ milter_negotiate(m, e, milters) if (tTd(64, 5)) sm_dprintf("milter_negotiate(%s): received: version %u, fflags 0x%x, pflags 0x%x\n", m->mf_name, m->mf_fvers, m->mf_fflags, m->mf_pflags); @@ -74,7 +74,7 @@ index 462efd2..af6dc66 100644 return -1; } -@@ -3230,6 +3227,7 @@ milter_changeheader(m, response, rlen, e) +@@ -3233,6 +3230,7 @@ milter_changeheader(m, response, rlen, e) addheader(newstr(field), mh_value, H_USER, e, !bitset(SMFIP_HDR_LEADSPC, m->mf_pflags)); } @@ -82,7 +82,7 @@ index 462efd2..af6dc66 100644 return; } -@@ -3438,6 +3436,8 @@ milter_chgfrom(response, rlen, e) +@@ -3441,6 +3439,8 @@ milter_chgfrom(response, rlen, e) { if (tTd(64, 10)) sm_dprintf("didn't follow protocol argc=%d\n", argc); @@ -91,7 +91,7 @@ index 462efd2..af6dc66 100644 return; } -@@ -3456,6 +3456,7 @@ milter_chgfrom(response, rlen, e) +@@ -3459,6 +3459,7 @@ milter_chgfrom(response, rlen, e) mail_esmtp_args); } Errors = olderrors; @@ -99,7 +99,7 @@ index 462efd2..af6dc66 100644 return; } -@@ -3503,6 +3504,8 @@ milter_addrcpt_par(response, rlen, e) +@@ -3506,6 +3507,8 @@ milter_addrcpt_par(response, rlen, e) { if (tTd(64, 10)) sm_dprintf("didn't follow protocol argc=%d\n", argc); @@ -108,7 +108,7 @@ index 462efd2..af6dc66 100644 return; } olderrors = Errors; -@@ -3527,6 +3530,7 @@ milter_addrcpt_par(response, rlen, e) +@@ -3530,6 +3533,7 @@ milter_addrcpt_par(response, rlen, e) } Errors = olderrors; @@ -117,10 +117,10 @@ index 462efd2..af6dc66 100644 } diff --git a/sendmail/queue.c b/sendmail/queue.c -index 503f296..c9153c8 100644 +index a323301..d61f626 100644 --- a/sendmail/queue.c +++ b/sendmail/queue.c -@@ -8590,6 +8590,7 @@ split_by_recipient(e) +@@ -8433,6 +8433,7 @@ split_by_recipient(e) if (split_within_queue(ee) == SM_SPLIT_FAIL) { e->e_sibling = firstsibling; @@ -128,7 +128,7 @@ index 503f296..c9153c8 100644 return false; } ee->e_flags |= EF_SPLIT; -@@ -8604,8 +8605,7 @@ split_by_recipient(e) +@@ -8447,8 +8448,7 @@ split_by_recipient(e) if (p == NULL) { /* let's try to get this done */ @@ -138,7 +138,7 @@ index 503f296..c9153c8 100644 } else lsplits = p; -@@ -8627,7 +8627,7 @@ split_by_recipient(e) +@@ -8470,7 +8470,7 @@ split_by_recipient(e) { sm_syslog(LOG_NOTICE, e->e_id, "split: count=%d, id%s=%s", n - 1, n > 2 ? "s" : "", lsplits); diff --git a/sendmail-8.15.2-gcc-10-fix.patch b/sendmail-8.15.2-gcc-10-fix.patch new file mode 100644 index 0000000..a50b742 --- /dev/null +++ b/sendmail-8.15.2-gcc-10-fix.patch @@ -0,0 +1,13 @@ +diff --git a/sendmail/sendmail.h b/sendmail/sendmail.h +index 441399c..95b90b8 100644 +--- a/sendmail/sendmail.h ++++ b/sendmail/sendmail.h +@@ -2551,7 +2551,7 @@ extern const SM_EXC_TYPE_T EtypeQuickAbort; /* type of a QuickAbort exception */ + # define SOL_IP IPPROTO_IP + # endif + # if defined(SOL_IP) && defined(IP_TOS) +-EXTERN int InetQoS; /* QoS mapping */ ++extern int InetQoS; /* QoS mapping */ + # endif + #endif + diff --git a/sendmail.spec b/sendmail.spec index 87c5bd4..c40a131 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -19,7 +19,7 @@ Summary: A widely used Mail Transport Agent (MTA) Name: sendmail Version: 8.15.2 -Release: 42%{?dist} +Release: 43%{?dist} License: Sendmail URL: http://www.sendmail.org/ @@ -94,8 +94,10 @@ Patch29: sendmail-8.15.2-format-security.patch Patch30: sendmail-8.15.2-openssl-1.1.0-ecdhe-fix.patch # rhbz#1736650 Patch31: sendmail-8.15.2-gethostbyname2.patch -# Upstream patch: -Patch32: sendmail-8.16.0.29-fix-covscan-issues.patch +# upstream patch: +Patch32: sendmail-8.15.2-fix-covscan-issues.patch +# sent upstream +Patch33: sendmail-8.15.2-gcc-10-fix.patch BuildRequires: libdb-devel BuildRequires: libnsl2-devel @@ -208,6 +210,7 @@ cp devtools/M4/UNIX/{,shared}library.m4 %patch30 -p1 -b .openssl-1.1.0-ecdhe-fix %patch31 -p1 -b .gethostbyname2 %patch32 -p1 -b .fix-covscan-issues +%patch33 -p1 -b .gcc-10-fix for f in RELEASE_NOTES contrib/etrn.0; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -710,6 +713,11 @@ exit 0 %changelog +* Mon Feb 10 2020 Jaroslav Škarvada - 8.15.2-43 +- Fixed FTBFS with gcc-10 + Resolves: rhbz#1800082 +- De-fuzzified fix-covscan-issues patch + * Thu Jan 30 2020 Fedora Release Engineering - 8.15.2-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild