From 695cad2a47c37acf0e8f1e909172a59617bb5c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 5 Jun 2023 11:47:25 +0200 Subject: [PATCH] New version Resolves: rhbz#2212083 --- .gitignore | 1 + sendmail-8.17.1-cyrus-sasl-2.1.28-fix.patch | 23 ------------- ...patch => sendmail-8.17.2-aliases_dir.patch | 28 ++++++++-------- ...patch => sendmail-8.17.2-localdomain.patch | 4 +-- ....patch => sendmail-8.17.2-makemapman.patch | 32 ++++++++++++------- ...n.patch => sendmail-8.17.2-noversion.patch | 10 +++--- ...7.1-qos.patch => sendmail-8.17.2-qos.patch | 26 +++++++-------- ...atch => sendmail-8.17.2-sasl2-in-etc.patch | 6 ++-- sendmail.spec | 23 ++++++------- sources | 2 +- 10 files changed, 71 insertions(+), 84 deletions(-) delete mode 100644 sendmail-8.17.1-cyrus-sasl-2.1.28-fix.patch rename sendmail-8.17.1-aliases_dir.patch => sendmail-8.17.2-aliases_dir.patch (81%) rename sendmail-8.17.1-localdomain.patch => sendmail-8.17.2-localdomain.patch (84%) rename sendmail-8.14.4-makemapman.patch => sendmail-8.17.2-makemapman.patch (62%) rename sendmail-8.14.9-noversion.patch => sendmail-8.17.2-noversion.patch (50%) rename sendmail-8.17.1-qos.patch => sendmail-8.17.2-qos.patch (91%) rename sendmail-8.17.1-sasl2-in-etc.patch => sendmail-8.17.2-sasl2-in-etc.patch (85%) diff --git a/.gitignore b/.gitignore index 587a48d..74b026b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /sendmail.8.15.2.tar.gz /sendmail.8.16.1.tar.gz /sendmail.8.17.1.tar.gz +/sendmail.8.17.2.tar.gz diff --git a/sendmail-8.17.1-cyrus-sasl-2.1.28-fix.patch b/sendmail-8.17.1-cyrus-sasl-2.1.28-fix.patch deleted file mode 100644 index 3fb5b76..0000000 --- a/sendmail-8.17.1-cyrus-sasl-2.1.28-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/sendmail/sendmail.h b/sendmail/sendmail.h -index 9e34dd9..e020d6e 100644 ---- a/sendmail/sendmail.h -+++ b/sendmail/sendmail.h -@@ -756,7 +756,7 @@ extern bool filesys_free __P((long)); - # define SASL_IS_AUTH 2 /* authenticated */ - - /* SASL options */ --# define SASL_AUTH_AUTH 0x1000 /* use auth= only if authenticated */ -+# define SASL_AUTH_AUTH 0x10000 /* use auth= only if authenticated */ - # if SASL >= 20101 - # define SASL_SEC_MASK SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */ - # else /* SASL >= 20101 */ -@@ -771,6 +771,9 @@ extern bool filesys_free __P((long)); - # endif /* SASL_SEC_NOPLAINTEXT & SASL_SEC_MASK) == 0 ... */ - # endif /* SASL >= 20101 */ - # define MAXOUTLEN 8192 /* length of output buffer, should be 2^n */ -+# if (SASL_AUTH_AUTH & SASL_SEC_MASK) != 0 -+# ERROR "change SASL_AUTH_AUTH notify sendmail.org!" -+# endif - - /* functions */ - extern char *intersect __P((char *, char *, SM_RPOOL_T *)); diff --git a/sendmail-8.17.1-aliases_dir.patch b/sendmail-8.17.2-aliases_dir.patch similarity index 81% rename from sendmail-8.17.1-aliases_dir.patch rename to sendmail-8.17.2-aliases_dir.patch index 0258ddc..965e133 100644 --- a/sendmail-8.17.1-aliases_dir.patch +++ b/sendmail-8.17.2-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 64d439c..1db4fd6 100644 +index f54635e..82d63c2 100644 --- a/sendmail/aliases.0 +++ b/sendmail/aliases.0 -@@ -63,7 +63,7 @@ DDEESSCCRRIIPPTTIIOONN +@@ -63,7 +63,7 @@ ALIASES(5) File Formats Manual ALIASES(5) the list of users defined in that file. This is only the raw data file; the actual aliasing information is @@ -47,26 +47,26 @@ index cb67508..52e5124 100644 newaliases(1). A diff --git a/sendmail/newaliases.0 b/sendmail/newaliases.0 -index d8952ee..0be8986 100644 +index 8c40726..e90f009 100644 --- a/sendmail/newaliases.0 +++ b/sendmail/newaliases.0 -@@ -10,7 +10,7 @@ SSYYNNOOPPSSIISS +@@ -10,7 +10,7 @@ NEWALIASES(1) General Commands Manual NEWALIASES(1) - DDEESSCCRRIIPPTTIIOONN - NNeewwaalliiaasseess rebuilds the random access data base for the mail aliases + 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. - NNeewwaalliiaasseess is identical to ``sendmail -bi''. -@@ -22,7 +22,7 @@ DDEESSCCRRIIPPTTIIOONN - sseennddmmaaiill.. + Newaliases is identical to ``sendmail -bi''. +@@ -22,7 +22,7 @@ NEWALIASES(1) General Commands Manual NEWALIASES(1) + sendmail. - FFIILLEESS + FILES - /etc/mail/aliases The mail aliases file + /etc/aliases The mail aliases file - SSEEEE AALLSSOO + SEE ALSO aliases(5), sendmail(8) diff --git a/sendmail/newaliases.1 b/sendmail/newaliases.1 index 59dc0de..9ba8752 100644 @@ -91,11 +91,11 @@ index 59dc0de..9ba8752 100644 .SH SEE ALSO aliases(5), sendmail(8) diff --git a/sendmail/sendmail.0 b/sendmail/sendmail.0 -index 8eceedd..24a17da 100644 +index 4227d16..2cb177d 100644 --- a/sendmail/sendmail.0 +++ b/sendmail/sendmail.0 -@@ -433,10 +433,10 @@ FFIILLEESS - names are all specified in _/_e_t_c_/_m_a_i_l_/_s_e_n_d_m_a_i_l_._c_f. Thus, these values +@@ -433,10 +433,10 @@ SENDMAIL(8) System Manager's Manual SENDMAIL(8) + names are all specified in /etc/mail/sendmail.cf. Thus, these values are only approximations. - /etc/mail/aliases diff --git a/sendmail-8.17.1-localdomain.patch b/sendmail-8.17.2-localdomain.patch similarity index 84% rename from sendmail-8.17.1-localdomain.patch rename to sendmail-8.17.2-localdomain.patch index 646880e..3cdba7d 100644 --- a/sendmail-8.17.1-localdomain.patch +++ b/sendmail-8.17.2-localdomain.patch @@ -1,8 +1,8 @@ diff --git a/cf/m4/proto.m4 b/cf/m4/proto.m4 -index cfd71b3..6a7cf1c 100644 +index 709e183..45eb58a 100644 --- a/cf/m4/proto.m4 +++ b/cf/m4/proto.m4 -@@ -1921,6 +1921,8 @@ R<@> < $* @ [IPv6:::1] > +@@ -1922,6 +1922,8 @@ R<@> < $* @ [IPv6:::1] > $: < ? $&{client_name} > < $1 @ [IPv6:::1] > R<@> < $* @ localhost.$m > $: < ? $&{client_name} > < $1 @ localhost.$m > diff --git a/sendmail-8.14.4-makemapman.patch b/sendmail-8.17.2-makemapman.patch similarity index 62% rename from sendmail-8.14.4-makemapman.patch rename to sendmail-8.17.2-makemapman.patch index 7beb0cd..0c4b21e 100644 --- a/sendmail-8.14.4-makemapman.patch +++ b/sendmail-8.17.2-makemapman.patch @@ -1,5 +1,7 @@ ---- sendmail-8.14.4/cf/cf/Build 1999-03-02 03:37:12.000000000 +0100 -+++ sendmail-8.14.4/cf/cf/Build.makemapman 2010-01-03 22:49:38.000000000 +0100 +diff --git a/cf/cf/Build b/cf/cf/Build +index 9fecb79..e9a5968 100755 +--- a/cf/cf/Build ++++ b/cf/cf/Build @@ -18,7 +18,7 @@ SMROOT=${SMROOT-../..} BUILDTOOLS=${BUILDTOOLS-$SMROOT/devtools} @@ -9,9 +11,11 @@ ret=$? if [ $ret -ne 0 ] then ---- sendmail-8.14.4/devtools/OS/Linux 2009-01-22 03:15:42.000000000 +0100 -+++ sendmail-8.14.4/devtools/OS/Linux.makemapman 2010-01-03 22:50:27.000000000 +0100 -@@ -6,7 +6,7 @@ +diff --git a/devtools/OS/Linux b/devtools/OS/Linux +index bc02f82..dec3ae6 100644 +--- a/devtools/OS/Linux ++++ b/devtools/OS/Linux +@@ -6,7 +6,7 @@ dnl Place personal settings in devtools/Site/site.config.m4 define(`confDEPEND_TYPE', `CC-M') define(`confCCOPTS_SO', `-fPIC') define(`confSM_OS_HEADER', `sm_os_linux') @@ -20,7 +24,7 @@ define(`confLIBS', `-ldl') define(`confEBINDIR', `/usr/sbin') APPENDDEF(`confLIBSEARCH', `crypt nsl') -@@ -16,6 +16,8 @@ +@@ -16,6 +16,8 @@ define(`confMTCCOPTS', `-D_REENTRANT') define(`confMTLDOPTS', `-lpthread') define(`confLDOPTS_SO', `-shared') define(`confSONAME',`-soname') @@ -29,9 +33,11 @@ ifelse(confBLDVARIANT, `DEBUG', dnl Debug build ---- sendmail-8.14.4/makemap/makemap.8 2008-05-03 01:07:48.000000000 +0200 -+++ sendmail-8.14.4/makemap/makemap.8.makemapman 2010-01-03 22:51:04.000000000 +0100 -@@ -52,12 +52,6 @@ +diff --git a/makemap/makemap.8 b/makemap/makemap.8 +index 16481ef..32cda2a 100644 +--- a/makemap/makemap.8 ++++ b/makemap/makemap.8 +@@ -54,12 +54,6 @@ selected using the parameter. They may be .TP @@ -44,9 +50,11 @@ btree B-Tree format maps. This requires the new Berkeley DB ---- sendmail-8.14.4/rmail/rmail.c 2001-09-18 23:45:29.000000000 +0200 -+++ sendmail-8.14.4/rmail/rmail.c.makemapman 2010-01-03 22:51:36.000000000 +0100 -@@ -276,7 +276,6 @@ +diff --git a/rmail/rmail.c b/rmail/rmail.c +index 154d772..d556df1 100644 +--- a/rmail/rmail.c ++++ b/rmail/rmail.c +@@ -276,7 +276,6 @@ main(argc, argv) args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */ args[i++] = "-G"; /* relay submission */ args[i++] = "-oee"; /* No errors, just status. */ diff --git a/sendmail-8.14.9-noversion.patch b/sendmail-8.17.2-noversion.patch similarity index 50% rename from sendmail-8.14.9-noversion.patch rename to sendmail-8.17.2-noversion.patch index f0ca667..4599a98 100644 --- a/sendmail-8.14.9-noversion.patch +++ b/sendmail-8.17.2-noversion.patch @@ -1,11 +1,11 @@ ---- sendmail-8.14.9/sendmail/helpfile 2014-03-06 18:31:31.000000000 +0100 -+++ sendmail-8.14.9/sendmail/helpfile.noversion 2014-05-21 17:25:29.000000000 +0200 -@@ -11,9 +11,7 @@ +diff --git a/sendmail/helpfile b/sendmail/helpfile +index 315cb0b..d47e4c5 100644 +--- a/sendmail/helpfile ++++ b/sendmail/helpfile +@@ -11,7 +11,7 @@ cpyr By using this file, you agree to the terms and conditions set cpyr forth in the LICENSE file which can be found at the top level of cpyr the sendmail distribution. cpyr --cpyr $$Id: helpfile,v 8.49 2013-11-22 20:51:55 ca Exp $$ --cpyr -smtp This is sendmail version $v +smtp This is sendmail smtp Topics: diff --git a/sendmail-8.17.1-qos.patch b/sendmail-8.17.2-qos.patch similarity index 91% rename from sendmail-8.17.1-qos.patch rename to sendmail-8.17.2-qos.patch index e08617d..e2a1239 100644 --- a/sendmail-8.17.1-qos.patch +++ b/sendmail-8.17.2-qos.patch @@ -12,7 +12,7 @@ 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 6a7cf1c..fd54e87 100644 +index 45eb58a..947f16f 100644 --- a/cf/m4/proto.m4 +++ b/cf/m4/proto.m4 @@ -264,6 +264,9 @@ _OPTION(SevenBitInput, `confSEVEN_BIT_INPUT', `False') @@ -26,10 +26,10 @@ index 6a7cf1c..fd54e87 100644 _OPTION(AliasWait, `confALIAS_WAIT', `5m') diff --git a/sendmail/conf.c b/sendmail/conf.c -index f1bc1b2..ca5dc85 100644 +index c3b52df..663186e 100644 --- a/sendmail/conf.c +++ b/sendmail/conf.c -@@ -6678,6 +6678,10 @@ char *FFRCompileOptions[] = +@@ -6728,6 +6728,10 @@ char *FFRCompileOptions[] = /* Check to make sure key fields were read from qf */ "_FFR_QF_PARANOIA", #endif @@ -41,10 +41,10 @@ index f1bc1b2..ca5dc85 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 5b42e32..c4604f0 100644 +index f15a7d8..6b43f78 100644 --- a/sendmail/daemon.c +++ b/sendmail/daemon.c -@@ -129,6 +129,10 @@ static int NDaemons = 0; /* actual number of daemons */ +@@ -124,6 +124,10 @@ static int NDaemons = 0; /* actual number of daemons */ static time_t NextDiskSpaceCheck = 0; @@ -55,7 +55,7 @@ index 5b42e32..c4604f0 100644 /* ** GETREQUESTS -- open mail IPC port and get requests. ** -@@ -1173,6 +1177,16 @@ opendaemonsocket(d, firsttime) +@@ -1167,6 +1171,16 @@ opendaemonsocket(d, firsttime) (void) setsockopt(d->d_socket, SOL_SOCKET, SO_KEEPALIVE, (char *)&on, sizeof(on)); @@ -72,7 +72,7 @@ index 5b42e32..c4604f0 100644 #ifdef SO_RCVBUF if (d->d_tcprcvbufsize > 0) { -@@ -2704,6 +2718,16 @@ gothostent: +@@ -2728,6 +2742,16 @@ gothostent: return EX_TEMPFAIL; } @@ -90,7 +90,7 @@ index 5b42e32..c4604f0 100644 if (ClientSettings[family].d_tcpsndbufsize > 0) { diff --git a/sendmail/readcf.c b/sendmail/readcf.c -index 47c9777..bb98dbf 100644 +index 2767b57..5790172 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 47c9777..bb98dbf 100644 #endif -@@ -2983,8 +2984,8 @@ static struct optioninfo +@@ -3137,8 +3138,8 @@ static struct optioninfo # define O_RCPTTHROTDELAY 0xe6 { "BadRcptThrottleDelay", O_RCPTTHROTDELAY, OI_SAFE }, #endif @@ -112,7 +112,7 @@ index 47c9777..bb98dbf 100644 { "InetQoS", O_INETQOS, OI_NONE }, #endif #if STARTTLS && _FFR_FIPSMODE -@@ -3059,6 +3060,77 @@ static struct optioninfo +@@ -3213,6 +3214,77 @@ static struct optioninfo { NULL, '\0', OI_NONE } }; @@ -190,7 +190,7 @@ index 47c9777..bb98dbf 100644 # define CANONIFY(val) # define SET_OPT_DEFAULT(opt, val) opt = val -@@ -4795,6 +4867,33 @@ setoption(opt, val, safe, sticky, e) +@@ -4949,6 +5021,33 @@ setoption(opt, val, safe, sticky, e) break; #endif @@ -225,10 +225,10 @@ index 47c9777..bb98dbf 100644 if (tTd(37, 1)) { diff --git a/sendmail/sendmail.h b/sendmail/sendmail.h -index ae7ed3a..9e34dd9 100644 +index 9983354..8ebaf97 100644 --- a/sendmail/sendmail.h +++ b/sendmail/sendmail.h -@@ -2646,6 +2646,15 @@ EXTERN SOCKADDR ConnectOnlyTo; /* override connection address (for testing) */ +@@ -2698,6 +2698,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-8.17.1-sasl2-in-etc.patch b/sendmail-8.17.2-sasl2-in-etc.patch similarity index 85% rename from sendmail-8.17.1-sasl2-in-etc.patch rename to sendmail-8.17.2-sasl2-in-etc.patch index 5b18c99..ac01c7c 100644 --- a/sendmail-8.17.1-sasl2-in-etc.patch +++ b/sendmail-8.17.2-sasl2-in-etc.patch @@ -1,8 +1,8 @@ diff --git a/sendmail/usersmtp.c b/sendmail/usersmtp.c -index 5fe0791..2417558 100644 +index f60537d..8c2dcf7 100644 --- a/sendmail/usersmtp.c +++ b/sendmail/usersmtp.c -@@ -1374,9 +1374,7 @@ safesaslfile(context, file) +@@ -1379,9 +1379,7 @@ safesaslfile(context, file) { long sff; int r; @@ -12,7 +12,7 @@ index 5fe0791..2417558 100644 char *p; if (SM_IS_EMPTY(file)) -@@ -1414,9 +1414,16 @@ safesaslfile(context, file) +@@ -1419,9 +1417,16 @@ safesaslfile(context, file) # endif /* SASL <= 10515 */ p = (char *) file; diff --git a/sendmail.spec b/sendmail.spec index 269342d..84dc120 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -28,8 +28,8 @@ Summary: A widely used Mail Transport Agent (MTA) Name: sendmail -Version: 8.17.1 -Release: 8%{?dist} +Version: 8.17.2 +Release: 1%{?dist} License: Sendmail URL: http://www.sendmail.org/ @@ -65,7 +65,7 @@ Source16: sendmail-etc-mail-trusted-users # default /etc/mail/virtusertable Source17: sendmail-etc-mail-virtusertable # fix man path and makemap man page -Patch3: sendmail-8.14.4-makemapman.patch +Patch3: sendmail-8.17.2-makemapman.patch # fix smrsh paths Patch4: sendmail-8.16.1-smrsh_paths.patch # fix sm-client.pid path @@ -77,25 +77,23 @@ 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.1-aliases_dir.patch +Patch13: sendmail-8.17.2-aliases_dir.patch # fix vacation Makefile Patch14: sendmail-8.14.9-vacation.patch # remove version information from sendmail helpfile -Patch15: sendmail-8.14.9-noversion.patch +Patch15: sendmail-8.17.2-noversion.patch # do not accept localhost.localdomain as valid address from SMTP -Patch16: sendmail-8.17.1-localdomain.patch +Patch16: sendmail-8.17.2-localdomain.patch # build libmilter as DSO Patch17: sendmail-8.14.3-sharedmilter.patch # skip colon separator when parsing service name in ServiceSwitchFile Patch18: sendmail-8.17.1-switchfile.patch # silence warning about missing sasl2 config in /usr/lib*, now in /etc/sasl2 -Patch23: sendmail-8.17.1-sasl2-in-etc.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.1-qos.patch +Patch25: sendmail-8.17.2-qos.patch Patch26: sendmail-8.17.1-libmilter-socket-activation.patch -# upstream patch -Patch27: sendmail-8.17.1-cyrus-sasl-2.1.28-fix.patch BuildRequires: make BuildRequires: libdb-devel @@ -206,7 +204,6 @@ cp devtools/M4/UNIX/{,shared}library.m4 %patch23 -p1 -b .sasl2-in-etc %patch25 -p1 -b .qos %patch26 -p1 -b .libmilter-socket-activation -%patch27 -p1 -b .cyrus-sasl-2.1.28-fix for f in RELEASE_NOTES contrib/etrn.0; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -711,6 +708,10 @@ exit 0 %changelog +* Mon Jun 5 2023 Jaroslav Škarvada - 8.17.2-1 +- New version + Resolves: rhbz#2212083 + * Sat Jan 21 2023 Fedora Release Engineering - 8.17.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 8c3d76b..615c032 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sendmail.8.17.1.tar.gz) = ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15 +SHA512 (sendmail.8.17.2.tar.gz) = a25d964136a3efeb7737c34aed34804dd61292bd70eaaba724274a862604a6cd5ca3bcac635e445864c23699b1704c3662d262a5694bd26e298fc1c0e8ba817d