!70 [sync] PR-65: fix config changes

From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

Sendmail-sasl2.conf

@@ -1 +1,2 @@
 pwcheck_method:saslauthd
+ldapdb_uri: ldapi:///

sendmail-redhat.mc

@@ -80,8 +80,8 @@ dnl define(`confINET_QOS', `AF11')dnl
 dnl FEATURE(delay_checks)dnl
 FEATURE(`no_default_msa', `dnl')dnl
 FEATURE(`smrsh', `/usr/sbin/smrsh')dnl
-FEATURE(`mailertable', `hash -o /etc/mail/mailertable.db')dnl
-FEATURE(`virtusertable', `hash -o /etc/mail/virtusertable.db')dnl
+dnl #FEATURE(`mailertable', `hash -o /etc/mail/mailertable.db')dnl
+dnl #FEATURE(`virtusertable', `hash -o /etc/mail/virtusertable.db')dnl
 FEATURE(redirect)dnl
 FEATURE(always_add_domain)dnl
 FEATURE(use_cw_file)dnl
@@ -103,7 +103,7 @@ dnl #
 dnl # The -t option will retry delivery if e.g. the user runs over his quota.
 dnl #
 FEATURE(local_procmail, `', `procmail -t -Y -a $h -d $u')dnl
-FEATURE(`access_db', `hash -T<TMPF> -o /etc/mail/access.db')dnl
+dnl #FEATURE(`access_db', `hash -T<TMPF> -o /etc/mail/access.db')dnl
 FEATURE(`blacklist_recipients')dnl
 EXPOSED_USER(`root')dnl
 dnl #

sendmail.etc-mail-make

@@ -54,7 +54,7 @@ makealiasesdb() {
   if [ "$(readlink -e /usr/bin/newaliases)" = /usr/sbin/sendmail.sendmail ]
   then
     /usr/bin/newaliases > /dev/null
-    touch -r /etc/aliases.db aliasesdb-stamp 2> /dev/null
+    touch -r /etc/aliases.dir /etc/aliases.pag  aliasesdb-stamp 2> /dev/null
   else
     rm -f aliasesdb-stamp
   fi

sendmail.spec

@@ -1,6 +1,6 @@
 Name:          sendmail
 Version:       8.17.1
-Release:       3
+Release:       8
 Summary:       A classic mail transfer agent from the Unix world
 License:       Sendmail
 URL:           http://www.sendmail.org/
@@ -21,7 +21,7 @@ Source13:      sendmail-etc-mail-local-host-names
 Source14:      sendmail-etc-mail-mailertable
 Source15:      sendmail-etc-mail-trusted-users
 
-BuildRequires: openssl-devel openldap-devel libnsl2-devel
+BuildRequires: openssl-devel openldap-devel libnsl2-devel gdbm-devel
 BuildRequires: cyrus-sasl-devel groff ghostscript m4 systemd setup >= 2.5.31-1
 BuildRequires: gcc
 Requires:      bash >= 2.0 setup >= 2.5.31-1 %{_sbindir}/saslauthd 
@@ -95,9 +95,9 @@ cp devtools/M4/UNIX/library.m4 devtools/M4/UNIX/sharedlibrary.m4
 export CFLAGS="${RPM_OPT_FLAGS}"
 
 cat << EOF > config.m4
-define(\`confMAPDEF', \`-DNIS -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
+define(\`confMAPDEF', \`-DNDBM -DNIS -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
 define(\`confOPTIMIZE', \`\`\`\`${RPM_OPT_FLAGS}'''')
-define(\`confLIBS', \`-lnsl -lcrypt -lresolv')
+define(\`confLIBS', \`-lgdbm -lgdbm_compat -lnsl -lcrypt -lresolv')
 define(\`confSTDIR', \`%{_localstatedir}/log/mail')
 define(\`confLDOPTS', \`-Xlinker -z -Xlinker relro -Xlinker -z -Xlinker now')
 define(\`confMANOWN', \`root')
@@ -217,9 +217,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 +343,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 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 644 %{_sysconfdir}/pki/tls/certs/sendmail.pem
+    chmod 600 %{_sysconfdir}/pki/tls/certs/sendmail.pem
 fi
 
 exit 0
@@ -467,6 +468,36 @@ exit 0
 
 
 %changelog
+* Wed May 22 2024 xinghe <xinghe2@h-partners.com> - 8.17.1-8
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix config changes
+
+* 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
+- SUG:NA
+- DESC: fix newaliases command error and postfix service start execption after sendmail install
+
+* Mon Feb 28 2022 xihaochen<xihaochen@h-partner.com> - 8.17.1-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix the issue that sendmail service fails to be started
+
 * Wed Feb 23 2022 xihaochen<xihaochen@h-partner.com> - 8.17.1-3
 - Type:bugfix
 - ID:NA