From bee5e8b4c14819101955f4bd382200ba6a29ea78 Mon Sep 17 00:00:00 2001 From: xinghe Date: Fri, 10 Mar 2023 07:36:02 +0000 Subject: [PATCH 1/2] modify certificate validity period (cherry picked from commit 75572b598ce33c605ca2a2e86d00437f627b3c55) --- sendmail.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sendmail.spec b/sendmail.spec index db10710..cabb661 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -1,6 +1,6 @@ Name: sendmail Version: 8.17.1 -Release: 6 +Release: 7 Summary: A classic mail transfer agent from the Unix world License: Sendmail URL: http://www.sendmail.org/ @@ -342,7 +342,7 @@ if [ ! -f %{_sysconfdir}/pki/tls/certs/sendmail.pem ]; then fi %{_bindir}/openssl req -new -key %{_sysconfdir}/pki/tls/private/sendmail.key -x509 -sha256 \ - -days 365 -set_serial $RANDOM -out %{_sysconfdir}/pki/tls/certs/sendmail.pem \ + -days 730 -set_serial $RANDOM -out %{_sysconfdir}/pki/tls/certs/sendmail.pem \ -subj "/C=--/ST=SomeState/L=SomeCity/O=SomeOrganization/OU=SomeOrganizationalUnit/CN=${FQDN}/emailAddress=root@${FQDN}" chmod 600 %{_sysconfdir}/pki/tls/certs/sendmail.pem fi @@ -467,6 +467,12 @@ exit 0 %changelog +* Fri Mar 10 2023 xinghe - 8.17.1-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: modify certificate validity period + * Tue Dec 13 2022 xinghe - 8.17.1-6 - Type:bugfix - ID:NA -- Gitee From 37205a974c055d4d6e41a16eb01cac2f43aaab0e Mon Sep 17 00:00:00 2001 From: jammyjellyfish Date: Mon, 17 Apr 2023 16:55:00 +0800 Subject: [PATCH 2/2] Support specify CC --- sendmail.spec | 9 ++++++++- support-specify-cc.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 support-specify-cc.patch diff --git a/sendmail.spec b/sendmail.spec index cabb661..8f033c2 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -1,6 +1,6 @@ Name: sendmail Version: 8.17.1 -Release: 7 +Release: 8 Summary: A classic mail transfer agent from the Unix world License: Sendmail URL: http://www.sendmail.org/ @@ -47,6 +47,7 @@ Patch0010: backport-sendmail-8.17.1-switchfile.patch Patch0011: backport-sendmail-8.17.1-sasl2-in-etc.patch Patch0012: backport-sendmail-8.17.1-qos.patch Patch0013: backport-sendmail-8.17.1-libmilter-socket-activation.patch +Patch0014: support-specify-cc.patch %description Sendmail is a general purpose internetwork email routing facility that @@ -467,6 +468,12 @@ exit 0 %changelog +* Mon Apr 17 2023 jammyjellyfish - 8.17.1-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Support specify CC + * Fri Mar 10 2023 xinghe - 8.17.1-7 - Type:bugfix - ID:NA diff --git a/support-specify-cc.patch b/support-specify-cc.patch new file mode 100644 index 0000000..66f1b41 --- /dev/null +++ b/support-specify-cc.patch @@ -0,0 +1,12 @@ +diff -up sendmail-8.17.1/devtools/M4/header.m4.orig2 sendmail-8.17.1/devtools/M4/header.m4 +--- sendmail-8.17.1/devtools/M4/header.m4.orig2 2023-04-17 16:51:13.396073699 +0800 ++++ sendmail-8.17.1/devtools/M4/header.m4 2023-04-17 16:51:35.632185100 +0800 +@@ -20,7 +20,7 @@ ifdef(`pushdef', `', + System V or GNU') + include(NoSuchFile)') + define(`confABI', `') +-define(`confCC', `cc') ++define(`confCC', `syscmd(`printf $CC')') + define(`confSHELL', `/bin/sh') + define(`confBEFORE', `') + define(`confLIBDIRS', `') -- Gitee