diff --git a/.gitignore b/.gitignore index 74b026b..c34cb72 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /sendmail.8.16.1.tar.gz /sendmail.8.17.1.tar.gz /sendmail.8.17.2.tar.gz +/sendmail.8.18.1.tar.gz diff --git a/sendmail-8.17.2-aliases_dir.patch b/sendmail-8.18.1-aliases_dir.patch similarity index 70% rename from sendmail-8.17.2-aliases_dir.patch rename to sendmail-8.18.1-aliases_dir.patch index cbcc5cd..85c481f 100644 --- a/sendmail-8.17.2-aliases_dir.patch +++ b/sendmail-8.18.1-aliases_dir.patch @@ -12,10 +12,10 @@ index c30fad0..492882e 100644 define(`confFROM_LINE', `From $g $d') define(`confOPERATORS', `.:%@!^/[]+') diff --git a/sendmail/aliases.0 b/sendmail/aliases.0 -index f54635e..82d63c2 100644 +index cfdbe17..5ea4c28 100644 --- a/sendmail/aliases.0 +++ b/sendmail/aliases.0 -@@ -63,7 +63,7 @@ ALIASES(5) File Formats Manual ALIASES(5) +@@ -63,7 +63,7 @@ DDEESSCCRRIIPPTTIIOONN the list of users defined in that file. This is only the raw data file; the actual aliasing information is @@ -46,28 +46,6 @@ index cb67508..52e5124 100644 using the program newaliases(1). A -diff --git a/sendmail/newaliases.0 b/sendmail/newaliases.0 -index 8c40726..e90f009 100644 ---- a/sendmail/newaliases.0 -+++ b/sendmail/newaliases.0 -@@ -10,7 +10,7 @@ NEWALIASES(1) General Commands Manual NEWALIASES(1) - - DESCRIPTION - Newaliases rebuilds the random access data base for the mail aliases -- file /etc/mail/aliases. It must be run each time this file is changed -+ file /etc/aliases. It must be run each time this file is changed - in order for the change to take effect. - - Newaliases is identical to ``sendmail -bi''. -@@ -22,7 +22,7 @@ NEWALIASES(1) General Commands Manual NEWALIASES(1) - sendmail. - - FILES -- /etc/mail/aliases The mail aliases file -+ /etc/aliases The mail aliases file - - SEE ALSO - aliases(5), sendmail(8) diff --git a/sendmail/newaliases.1 b/sendmail/newaliases.1 index 59dc0de..9ba8752 100644 --- a/sendmail/newaliases.1 @@ -91,12 +69,13 @@ index 59dc0de..9ba8752 100644 .SH SEE ALSO aliases(5), sendmail(8) diff --git a/sendmail/sendmail.0 b/sendmail/sendmail.0 +index 8059e04..fd3983b 100644 --- a/sendmail/sendmail.0 +++ b/sendmail/sendmail.0 -@@ -433,10 +433,11 @@ SENDMAIL(8) System Manager's Manual SENDMAIL(8) - names are all specified in /etc/mail/sendmail.cf. Thus, these values +@@ -434,10 +434,11 @@ FFIILLEESS are only approximations. + - /etc/mail/aliases + /etc/aliases raw data for alias names @@ -108,6 +87,7 @@ diff --git a/sendmail/sendmail.0 b/sendmail/sendmail.0 /etc/mail/sendmail.cf diff --git a/sendmail/sendmail.8 b/sendmail/sendmail.8 +index abcc401..689737f 100644 --- a/sendmail/sendmail.8 +++ b/sendmail/sendmail.8 @@ -716,10 +716,11 @@ Thus, diff --git a/sendmail-8.17.2-localdomain.patch b/sendmail-8.18.1-localdomain.patch similarity index 84% rename from sendmail-8.17.2-localdomain.patch rename to sendmail-8.18.1-localdomain.patch index 3cdba7d..37ffdad 100644 --- a/sendmail-8.17.2-localdomain.patch +++ b/sendmail-8.18.1-localdomain.patch @@ -1,8 +1,8 @@ diff --git a/cf/m4/proto.m4 b/cf/m4/proto.m4 -index 709e183..45eb58a 100644 +index ff7eb0b..58708e3 100644 --- a/cf/m4/proto.m4 +++ b/cf/m4/proto.m4 -@@ -1922,6 +1922,8 @@ R<@> < $* @ [IPv6:::1] > +@@ -1924,6 +1924,8 @@ R<@> < $* @ [IPv6:::1] > $: < ? $&{client_name} > < $1 @ [IPv6:::1] > R<@> < $* @ localhost.$m > $: < ? $&{client_name} > < $1 @ localhost.$m > diff --git a/sendmail-8.17.2-qos.patch b/sendmail-8.18.1-qos.patch similarity index 92% rename from sendmail-8.17.2-qos.patch rename to sendmail-8.18.1-qos.patch index e2a1239..46dbd8f 100644 --- a/sendmail-8.17.2-qos.patch +++ b/sendmail-8.18.1-qos.patch @@ -12,10 +12,10 @@ index 6e2b360..45df0e6 100644 dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl FEATURE(`use_ct_file')dnl diff --git a/cf/m4/proto.m4 b/cf/m4/proto.m4 -index 45eb58a..947f16f 100644 +index 58708e3..fb0264a 100644 --- a/cf/m4/proto.m4 +++ b/cf/m4/proto.m4 -@@ -264,6 +264,9 @@ _OPTION(SevenBitInput, `confSEVEN_BIT_INPUT', `False') +@@ -266,6 +266,9 @@ _OPTION(SevenBitInput, `confSEVEN_BIT_INPUT', `False') # 8-bit data handling _OPTION(EightBitMode, `confEIGHT_BIT_HANDLING', `pass8') @@ -26,7 +26,7 @@ index 45eb58a..947f16f 100644 _OPTION(AliasWait, `confALIAS_WAIT', `5m') diff --git a/sendmail/conf.c b/sendmail/conf.c -index c3b52df..663186e 100644 +index 762e0d2..75c5e12 100644 --- a/sendmail/conf.c +++ b/sendmail/conf.c @@ -6728,6 +6728,10 @@ char *FFRCompileOptions[] = @@ -41,7 +41,7 @@ index c3b52df..663186e 100644 /* Allow QueueSortOrder per queue group. */ /* XXX: Still need to actually use qgrp->qg_sortorder */ diff --git a/sendmail/daemon.c b/sendmail/daemon.c -index f15a7d8..6b43f78 100644 +index d37c508..5fa284a 100644 --- a/sendmail/daemon.c +++ b/sendmail/daemon.c @@ -124,6 +124,10 @@ static int NDaemons = 0; /* actual number of daemons */ @@ -55,7 +55,7 @@ index f15a7d8..6b43f78 100644 /* ** GETREQUESTS -- open mail IPC port and get requests. ** -@@ -1167,6 +1171,16 @@ opendaemonsocket(d, firsttime) +@@ -1166,6 +1170,16 @@ opendaemonsocket(d, firsttime) (void) setsockopt(d->d_socket, SOL_SOCKET, SO_KEEPALIVE, (char *)&on, sizeof(on)); @@ -72,7 +72,7 @@ index f15a7d8..6b43f78 100644 #ifdef SO_RCVBUF if (d->d_tcprcvbufsize > 0) { -@@ -2728,6 +2742,16 @@ gothostent: +@@ -2730,6 +2744,16 @@ gothostent: return EX_TEMPFAIL; } @@ -90,7 +90,7 @@ index f15a7d8..6b43f78 100644 if (ClientSettings[family].d_tcpsndbufsize > 0) { diff --git a/sendmail/readcf.c b/sendmail/readcf.c -index 2767b57..5790172 100644 +index 24b0a6f..9406160 100644 --- a/sendmail/readcf.c +++ b/sendmail/readcf.c @@ -24,6 +24,7 @@ SM_RCSID("@(#)$Id: readcf.c,v 8.692 2013-11-22 20:51:56 ca Exp $") @@ -101,7 +101,7 @@ index 2767b57..5790172 100644 #endif -@@ -3137,8 +3138,8 @@ static struct optioninfo +@@ -3135,8 +3136,8 @@ static struct optioninfo # define O_RCPTTHROTDELAY 0xe6 { "BadRcptThrottleDelay", O_RCPTTHROTDELAY, OI_SAFE }, #endif @@ -112,7 +112,7 @@ index 2767b57..5790172 100644 { "InetQoS", O_INETQOS, OI_NONE }, #endif #if STARTTLS && _FFR_FIPSMODE -@@ -3213,6 +3214,77 @@ static struct optioninfo +@@ -3211,6 +3212,77 @@ static struct optioninfo { NULL, '\0', OI_NONE } }; @@ -190,7 +190,7 @@ index 2767b57..5790172 100644 # define CANONIFY(val) # define SET_OPT_DEFAULT(opt, val) opt = val -@@ -4949,6 +5021,33 @@ setoption(opt, val, safe, sticky, e) +@@ -4946,6 +5018,33 @@ setoption(opt, val, safe, sticky, e) break; #endif @@ -225,10 +225,10 @@ index 2767b57..5790172 100644 if (tTd(37, 1)) { diff --git a/sendmail/sendmail.h b/sendmail/sendmail.h -index 9983354..8ebaf97 100644 +index 0f6d01d..5910a8b 100644 --- a/sendmail/sendmail.h +++ b/sendmail/sendmail.h -@@ -2698,6 +2698,15 @@ EXTERN SOCKADDR ConnectOnlyTo; /* override connection address (for testing) */ +@@ -2725,6 +2725,15 @@ EXTERN SOCKADDR ConnectOnlyTo; /* override connection address (for testing) */ EXTERN SOCKADDR RealHostAddr; /* address of host we are talking to */ extern const SM_EXC_TYPE_T EtypeQuickAbort; /* type of a QuickAbort exception */ diff --git a/sendmail.spec b/sendmail.spec index ecf7759..c1826c9 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -40,12 +40,12 @@ Summary: A widely used Mail Transport Agent (MTA) Name: sendmail -Version: 8.17.2 -Release: 6%{?dist} +Version: 8.18.1 +Release: 1%{?dist} License: sendmail-8.23 AND MIT AND MIT-CMU AND BSD-3-Clause AND CDDL-1.0 AND BSD-4-Clause AND BSD-4-Clause-UC AND PostgreSQL AND ISC AND HPND-sell-variant AND mailprio URL: http://www.sendmail.org/ -Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz +Source0: https://ftp.sendmail.org/sendmail.%{version}.tar.gz # Systemd Service file Source1: sendmail.service # NetworkManager dispatch script @@ -89,13 +89,13 @@ Patch11: sendmail-8.17.1-dynamic.patch # fix cyrus path Patch12: sendmail-8.13.0-cyrus.patch # fix aliases.db path -Patch13: sendmail-8.17.2-aliases_dir.patch +Patch13: sendmail-8.18.1-aliases_dir.patch # fix vacation Makefile Patch14: sendmail-8.14.9-vacation.patch # remove version information from sendmail helpfile Patch15: sendmail-8.17.2-noversion.patch # do not accept localhost.localdomain as valid address from SMTP -Patch16: sendmail-8.17.2-localdomain.patch +Patch16: sendmail-8.18.1-localdomain.patch # build libmilter as DSO Patch17: sendmail-8.14.3-sharedmilter.patch # skip colon separator when parsing service name in ServiceSwitchFile @@ -104,7 +104,7 @@ Patch18: sendmail-8.17.1-switchfile.patch Patch23: sendmail-8.17.2-sasl2-in-etc.patch # add QoS support, patch from Philip Prindeville # upstream reserved option ID 0xe7 for testing of this new feature, #576643 -Patch25: sendmail-8.17.2-qos.patch +Patch25: sendmail-8.18.1-qos.patch Patch26: sendmail-8.17.1-libmilter-socket-activation.patch BuildRequires: make @@ -725,6 +725,11 @@ exit 0 %changelog +* Wed Jan 31 2024 Jaroslav Škarvada - 8.18.1-1 +- New version + Resolves: rhbz#2228229 + Resolves: CVE-2023-51765 + * Sat Jan 27 2024 Fedora Release Engineering - 8.17.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 615c032..a941f26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sendmail.8.17.2.tar.gz) = a25d964136a3efeb7737c34aed34804dd61292bd70eaaba724274a862604a6cd5ca3bcac635e445864c23699b1704c3662d262a5694bd26e298fc1c0e8ba817d +SHA512 (sendmail.8.18.1.tar.gz) = 9ce713b44439d4de6faa9e3cdfa2226b44b4fbeb352a5f81584c062570e9472da244158287e489aabe258d28fe54ca4964565c7b0adc7e1763d212be42f98061