Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
927777c660
!78 [sync] PR-75: extending the certificate validate period and remove redundant patches
From: @openeuler-sync-bot 
Reviewed-by: @open-bot 
Signed-off-by: @open-bot
2025-02-13 01:44:24 +00:00
xh
4244359591 extending the certificate validate period
remove redundant patches

(cherry picked from commit 7534b7f15cabaf20116feea135596488be044235)
2025-02-13 09:00:41 +08:00
openeuler-ci-bot
e8e508837d
!71 [sync] PR-62: fix config changes
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2024-05-23 07:16:40 +00:00
xinghe
6167e8fee7 fix config changes
(cherry picked from commit dccf80e348f2a92278deedf18fee5d81cfb48420)
2024-05-23 11:35:07 +08:00
openeuler-ci-bot
5c8173b5eb
!58 update sendmail to 8.17.2
From: @xinghe_1 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2023-08-08 06:19:17 +00:00
xinghe
2e1c6bbc7e update sendmail to 8.17.2 2023-07-27 15:19:07 +08:00
openeuler-ci-bot
f8386174bc
!50 modify certificate validity period
From: @xinghe_1 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo
2023-03-10 08:51:22 +00:00
xinghe
75572b598c modify certificate validity period 2023-03-10 07:36:02 +00:00
openeuler-ci-bot
f075616933
!49 [sync] PR-44: fix sendmail.pem unsafe
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-12-15 11:02:34 +00:00
xinghe
c59c68c311 fix sendmail.pem unsafe
(cherry picked from commit 8696486ee6d8ad7db2798a51f84751be9b1a97f4)
2022-12-15 11:44:49 +08:00
8 changed files with 84 additions and 319 deletions

View File

@ -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 */
--

View File

@ -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:

View File

@ -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

View File

@ -1,92 +0,0 @@
diff --git a/sendmail/srvrsmtp.c b/sendmail/srvrsmtp.c
index ba636a8..46c5356 100644
--- a/sendmail/srvrsmtp.c
+++ b/sendmail/srvrsmtp.c
@@ -159,6 +159,26 @@
#define SKIP_SPACE(s) while (SM_ISSPACE(*s)) \
(s)++
+static inline void
+message1(fmt)
+ char *fmt;
+{
+ if (strchr(fmt, '%') == NULL)
+ message(fmt, NULL);
+ else
+ message("%s", fmt);
+}
+
+static inline void
+usrerr1(fmt)
+ char *fmt;
+{
+ if (strchr(fmt, '%') == NULL)
+ usrerr(fmt, NULL);
+ else
+ usrerr("%s", fmt);
+}
+
#if _FFR_EAI
/*
** ADDR_IS_ASCII -- check whether an address is 100% printable ASCII
@@ -638,13 +658,13 @@
bool tsave = QuickAbort; \
\
QuickAbort = false; \
- usrerr(response); \
+ usrerr1(response); \
QuickAbort = tsave; \
e->e_sendqueue = NULL; \
goto doquit; \
} \
else \
- usrerr(response); \
+ usrerr1(response); \
break; \
\
case SMFIR_REJECT: \
@@ -1011,7 +1031,7 @@
else if (strncmp(nullserver, "421 ", 4) == 0)
{
/* Can't use ("%s", ...) due to message() requirements */
- message(nullserver);
+ message1(nullserver);
goto doquit;
}
@@ -1953,7 +1973,7 @@
if (ISSMTPREPLY(nullserver))
{
/* Can't use ("%s", ...) due to usrerr() requirements */
- usrerr(nullserver);
+ usrerr1(nullserver);
}
else
{
@@ -2561,7 +2581,7 @@
if (response != NULL)
{
/* Can't use ("%s", ...) due to usrerr() requirements */
- usrerr(response);
+ usrerr1(response);
}
else
{
@@ -3800,7 +3820,7 @@
#endif
/* Can't use ("%s", ...) due to usrerr() requirements */
- usrerr(response);
+ usrerr1(response);
if (strncmp(response, "421 ", 4) == 0
|| strncmp(response, "421-", 4) == 0)
{
@@ -3922,7 +3942,7 @@
(void) extenhsc(response + 4, ' ', e->e_enhsc);
#endif
/* Can't use ("%s", ...) due to usrerr() requirements */
- usrerr(response);
+ usrerr1(response);
if (strncmp(response, "421 ", 4) == 0
|| strncmp(response, "421-", 4) == 0)
rv = false;

View File

@ -1,183 +0,0 @@
--- sendmail-8.15.2.orig/sendmail/tls.c 2016-12-01 15:20:59.953546417 +0100
+++ sendmail-8.15.2.orig/sendmail/tls.c 2016-12-01 17:26:43.868521378 +0100
@@ -79,7 +79,8 @@
static DH *
get_dh512()
{
- DH *dh = NULL;
+ DH *dh;
+ BIGNUM *p, *g;
# if MTA_HAVE_DH_set0_pqg
BIGNUM *dhp_bn, *dhg_bn;
# endif
@@ -96,13 +97,23 @@
return NULL;
}
# else
- dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL);
- dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL);
- if ((dh->p == NULL) || (dh->g == NULL))
+ p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL);
+ g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL);
+ if (p == NULL || g == NULL)
{
+ BN_free(p);
+ BN_free(g);
DH_free(dh);
return NULL;
}
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
+ DH_set0_pqg(dh, p, NULL, g);
+#else
+ dh->p = p;
+ dh->g = g;
+#endif
+
# endif
return dh;
}
@@ -150,6 +161,8 @@
};
static unsigned char dh2048_g[]={ 0x02, };
DH *dh;
+ BIGNUM *p, *g;
+
# if MTA_HAVE_DH_set0_pqg
BIGNUM *dhp_bn, *dhg_bn;
# endif
@@ -166,13 +179,23 @@
return NULL;
}
# else
- dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
- dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
- if ((dh->p == NULL) || (dh->g == NULL))
+ p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
+ g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+ if (p == NULL || g == NULL)
{
+ BN_free(p);
+ BN_free(g);
DH_free(dh);
- return(NULL);
+ return NULL;
}
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
+ DH_set0_pqg(dh, p, NULL, g);
+#else
+ dh->p = p;
+ dh->g = g;
+#endif
+
# endif
return(dh);
}
@@ -929,6 +952,54 @@
# define SM_SSL_OP_TLS_BLOCK_PADDING_BUG 0
# endif
+static RSA *
+generate_rsa_key(bits, e)
+ int bits;
+ unsigned long e;
+{
+#if OPENSSL_VERSION_NUMBER < 0x00908000L
+ return RSA_generate_key(bits, e, NULL, NULL);
+#else
+ BIGNUM *bne;
+ RSA *rsa = NULL;
+
+ bne = BN_new();
+ if (bne && BN_set_word(bne, e) != 1)
+ rsa = RSA_new();
+ if (rsa && RSA_generate_key_ex(rsa, bits, bne, NULL) != 1)
+ {
+ RSA_free(rsa);
+ rsa = NULL;
+ }
+ BN_free(bne);
+ return rsa;
+#endif
+}
+
+static DSA *
+generate_dsa_parameters(bits, seed, seed_len, counter_ret, h_ret)
+ int bits;
+ unsigned char *seed;
+ int seed_len;
+ int *counter_ret;
+ unsigned long *h_ret;
+{
+#if OPENSSL_VERSION_NUMBER < 0x00908000L
+ return DSA_generate_parameters(bits, seed, seed_len, counter_ret,
+ h_ret, NULL, NULL);
+#else
+ DSA *dsa = DSA_new();
+
+ if (dsa && DSA_generate_parameters_ex(dsa, bits, seed, seed_len,
+ counter_ret, h_ret, NULL) != 1)
+ {
+ DSA_free(dsa);
+ dsa = NULL;
+ }
+ return dsa;
+#endif
+}
+
bool
inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhparam)
SSL_CTX **ctx;
@@ -1183,8 +1254,7 @@
if (bitset(TLS_I_RSA_TMP, req)
# if SM_CONF_SHM
&& ShmId != SM_SHM_NO_ID &&
- (rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL,
- NULL)) == NULL
+ (rsa_tmp = generate_rsa_key(RSA_KEYLENGTH, RSA_F4)) == NULL
# else /* SM_CONF_SHM */
&& 0 /* no shared memory: no need to generate key now */
# endif /* SM_CONF_SHM */
@@ -1391,8 +1461,8 @@
}
# else
/* this takes a while! */
- dsa = DSA_generate_parameters(bits, NULL, 0, NULL,
- NULL, 0, NULL);
+ dsa = generate_dsa_parameters(bits, NULL, 0, NULL,
+ NULL);
dh = DSA_dup_DH(dsa);
# endif
DSA_free(dsa);
@@ -2081,7 +2151,7 @@
if (rsa_tmp != NULL)
RSA_free(rsa_tmp);
- rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL, NULL);
+ rsa_tmp = generate_rsa_key(RSA_KEYLENGTH, RSA_F4);
if (rsa_tmp == NULL)
{
if (LogLevel > 0)
@@ -2526,12 +2596,21 @@
SM_GETTLSI;
if (LogLevel > 13)
tls_verify_log(ok, ctx, "X509");
+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
+ if (X509_STORE_CTX_get_error(ctx) ==
+ X509_V_ERR_UNABLE_TO_GET_CRL)
+ {
+ X509_STORE_CTX_set_error(ctx, 0);
+ return 1; /* override it */
+ }
+#else
if (X509_STORE_CTX_get_error(ctx) == X509_V_ERR_UNABLE_TO_GET_CRL &&
!SM_TLSI_IS(tlsi_ctx, TLSI_FL_CRLREQ))
{
X509_STORE_CTX_set_error(ctx, 0);
return 1; /* override it */
}
+#endif
return ok;
}

Binary file not shown.

BIN
sendmail.8.17.2.tar.gz Normal file

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: sendmail
Version: 8.17.1
Release: 5
Version: 8.17.2
Release: 3
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
#'
@ -217,9 +218,10 @@ install -p -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/mail/mailertable
install -p -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_sysconfdir}/mail/trusted-users
sed -i -e 's|@@PATH@@|%{_datadir}/sendmail-cf|' $RPM_BUILD_ROOT%{_sysconfdir}/mail/sendmail.mc
sed -i -e 's|@@PATH@@|cf|' %{SOURCE9}
m4 %{SOURCE9} > $RPM_BUILD_ROOT%{_sysconfdir}/mail/sendmail.cf
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/mail/sendmail.cf
cp $RPM_BUILD_ROOT%{_sysconfdir}/mail/sendmail.mc cf/cf/sendmail_tmp.mc
sed -i -e 's|%{_datadir}\/sendmail-cf|cf|' cf/cf/sendmail_tmp.mc
m4 cf/cf/sendmail_tmp.mc > cf/cf/sendmail.cf
install -m 644 cf/cf/sendmail.cf $RPM_BUILD_ROOT%{_sysconfdir}/mail/sendmail.cf
for map in virtusertable access domaintable mailertable ; do
touch $RPM_BUILD_ROOT%{_sysconfdir}/mail/${map}.db
@ -342,9 +344,9 @@ 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 2190 -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 644 %{_sysconfdir}/pki/tls/certs/sendmail.pem
chmod 600 %{_sysconfdir}/pki/tls/certs/sendmail.pem
fi
exit 0
@ -413,12 +415,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 +469,37 @@ exit 0
%changelog
* Wed Feb 12 2025 xinghe <xinghe2@h-partners.com> - 8.17.2-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:extending the certificate validate period
remove redundant patches
* Wed May 22 2024 xinghe <xinghe2@h-partners.com> - 8.17.2-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix config changes
* Wed Jul 26 2023 xinghe <xinghe2@h-partners.com> - 8.17.2-1
- Type:requirements
- ID:NA
- SUG:NA
- DESC:update sendmail to 8.17.2
* Fri Mar 10 2023 xinghe <xinghe2@h-partners.com> - 8.17.1-7
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: modify certificate validity period
* Tue Dec 13 2022 xinghe <xinghe2@h-partners.com> - 8.17.1-6
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: fix sendmail.pem unsafe
* Wed Oct 12 2022 yanglu<yanglu72@h-partners.com> - 8.17.1-5
- Type:bugfix
- ID:NA