diff --git a/backport-sendmail-8.14.4-makemapman.patch b/backport-sendmail-8.14.4-makemapman.patch index 7beb0cdcc784c3c880cdd036ea2bec8b0ea05486..18498c6d41844d51bb6a13fadef451c1adb73582 100644 --- a/backport-sendmail-8.14.4-makemapman.patch +++ b/backport-sendmail-8.14.4-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. */ @@ -54,3 +62,4 @@ args[i++] = "-oi"; /* Ignore '.' on a line by itself. */ /* set from system and protocol used */ +-- \ No newline at end of file diff --git a/backport-sendmail-8.14.9-noversion.patch b/backport-sendmail-8.14.9-noversion.patch index f0ca667b18f0f26e400208dac2741dbd7930f9e6..749907425ade53298c839228a5677feffa9ece66 100644 --- a/backport-sendmail-8.14.9-noversion.patch +++ b/backport-sendmail-8.14.9-noversion.patch @@ -1,11 +1,9 @@ --- 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 @@ +@@ -11,7 +11,7 @@ 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/backport-sendmail-8.17.1-aliases_dir.patch b/backport-sendmail-8.17.1-aliases_dir.patch index 0258ddc2f716d795920a99ec1fb4eb46914034c7..965e133c237e0ab79f6b2b1cf04c3f09f79e6a4b 100644 --- a/backport-sendmail-8.17.1-aliases_dir.patch +++ b/backport-sendmail-8.17.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 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.tar.gz b/sendmail.8.17.1.tar.gz deleted file mode 100644 index 5492000873f464cb6ca92fa64475a244626ced3a..0000000000000000000000000000000000000000 Binary files a/sendmail.8.17.1.tar.gz and /dev/null differ diff --git a/sendmail.8.17.2.tar.gz b/sendmail.8.17.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..89de67d6e5cda2447bb68afa050ac8966b6f3573 Binary files /dev/null and b/sendmail.8.17.2.tar.gz differ diff --git a/sendmail.spec b/sendmail.spec index cabb6610f0b8d3252358645ed7228495d174e1ae..1b6202d09b67e24c5f8e48b3b2c0eb5ca712030a 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -1,6 +1,6 @@ Name: sendmail -Version: 8.17.1 -Release: 7 +Version: 8.17.2 +Release: 1 Summary: A classic mail transfer agent from the Unix world License: Sendmail URL: http://www.sendmail.org/ @@ -92,14 +92,14 @@ cp devtools/M4/UNIX/library.m4 devtools/M4/UNIX/sharedlibrary.m4 %autopatch -p1 %build -export CFLAGS="${RPM_OPT_FLAGS}" +%set_build_flags cat << EOF > config.m4 define(\`confMAPDEF', \`-DNDBM -DNIS -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1') -define(\`confOPTIMIZE', \`\`\`\`${RPM_OPT_FLAGS}'''') +define(\`confOPTIMIZE', \`\`\`\`${CFLAGS}'''') define(\`confLIBS', \`-lgdbm -lgdbm_compat -lnsl -lcrypt -lresolv') define(\`confSTDIR', \`%{_localstatedir}/log/mail') -define(\`confLDOPTS', \`-Xlinker -z -Xlinker relro -Xlinker -z -Xlinker now') +define(\`confLDOPTS', \`${LDFLAGS}') define(\`confMANOWN', \`root') define(\`confMANGRP', \`root') define(\`confENVDEF', \`-I/usr/kerberos/include -Wall -DXDEBUG=0') @@ -110,6 +110,7 @@ define(\`confMAN5SRC', \`5') define(\`confMAN8SRC', \`8') define(\`STATUS_FILE', \`%{_localstatedir}/log/mail/statistics') define(\`confLIBSEARCH', \`resolv 44bsd') +define(\`confCC', \`%{__cc}') EOF #' @@ -413,12 +414,12 @@ exit 0 %config(noreplace) %{_sysconfdir}/mail/virtusertable %ghost %{_sysconfdir}/mail/aliasesdb-stamp -%ghost %{_sysconfdir}/mail/virtusertable.db -%ghost %{_sysconfdir}/mail/access.db -%ghost %{_sysconfdir}/mail/domaintable.db -%ghost %{_sysconfdir}/mail/mailertable.db +%ghost %attr(0640, root,root) %verify(not md5 size mtime) %{_sysconfdir}/mail/virtusertable.db +%ghost %attr(0640, root,root) %verify(not md5 size mtime) %{_sysconfdir}/mail/access.db +%ghost %attr(0640, root,root) %verify(not md5 size mtime) %{_sysconfdir}/mail/domaintable.db +%ghost %attr(0640, root,root) %verify(not md5 size mtime) %{_sysconfdir}/mail/mailertable.db -%ghost %{_localstatedir}/spool/clientmqueue/sm-client.st +%ghost %attr(0660, smmsp, smmsp) %verify(not md5 size mtime) %{_localstatedir}/spool/clientmqueue/sm-client.st %{_unitdir}/sendmail.service %{_unitdir}/sm-client.service @@ -467,6 +468,12 @@ exit 0 %changelog +* Wed Jul 26 2023 xinghe - 8.17.2-1 +- Type:requirements +- ID:NA +- SUG:NA +- DESC:update sendmail to 8.17.2 + * Fri Mar 10 2023 xinghe - 8.17.1-7 - Type:bugfix - ID:NA