2 changed files with 11 additions and 36 deletions
--- a/sendmail.etc-mail-make
+++ b/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.dir /etc/aliases.pag aliasesdb-stamp 2> /dev/null
+    touch -r /etc/aliases.db aliasesdb-stamp 2> /dev/null
  else
    rm -f aliasesdb-stamp
  fi
--- a/sendmail.spec
+++ b/sendmail.spec
@ -1,6 +1,6 @@
 Name:          sendmail
 Version:       8.16.1
-Release:       11
+Release:       7
 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 gdbm-devel
+BuildRequires: openssl-devel openldap-devel libnsl2-devel
 BuildRequires: cyrus-sasl-devel groff ghostscript m4 systemd setup >= 2.5.31-1
 Requires:      bash >= 2.0 setup >= 2.5.31-1 %{_sbindir}/saslauthd 
 Requires:      procmail
@ -97,9 +97,9 @@ cp devtools/M4/UNIX/library.m4 devtools/M4/UNIX/sharedlibrary.m4
 export CFLAGS="${RPM_OPT_FLAGS}"

 cat << EOF > config.m4
-define(\`confMAPDEF', \`-DNDBM -DNIS -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
+define(\`confMAPDEF', \`-DNIS -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
 define(\`confOPTIMIZE', \`\`\`\`${RPM_OPT_FLAGS}'''')
-define(\`confLIBS', \`-lgdbm -lgdbm_compat -lnsl -lcrypt -lresolv')
+define(\`confLIBS', \`-lnsl -lcrypt -lresolv')
 define(\`confSTDIR', \`%{_localstatedir}/log/mail')
 define(\`confLDOPTS', \`-Xlinker -z -Xlinker relro -Xlinker -z -Xlinker now')
 define(\`confMANOWN', \`root')
@ -219,10 +219,9 @@ 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
-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
+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

 for map in virtusertable access domaintable mailertable ; do
    touch     $RPM_BUILD_ROOT%{_sysconfdir}/mail/${map}.db
@ -345,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 730 -set_serial $RANDOM -out %{_sysconfdir}/pki/tls/certs/sendmail.pem \
+        -days 365 -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
+    chmod 644 %{_sysconfdir}/pki/tls/certs/sendmail.pem
 fi

 exit 0
@ -470,30 +469,6 @@ exit 0


 %changelog
-* Wed May 22 2024 xinghe <xinghe2@h-partners.com> - 8.16.1-11
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix config changes
-
-* Fri Mar 10 2023 xinghe <xinghe2@h-partners.com> - 8.16.1-10
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: modify certificate validity period
-
-* Thu Dec 15 2022 xinghe <xinghe2@h-partners.com> - 8.16.1-9
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: fix sendmail.pem unsafe
-
-* Wed Oct 12 2022 yanglu<yanglu72@h-partners.com> - 8.16.1-8
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: fix newaliases command error and postfix service start execption after sendmail install
-
 * Thu Aug 04 2022 yanglu <yanglu72@h-partners.com> - 8.16.1-7
 - Type:bugfix
 - ID:NA
@ -506,7 +481,7 @@ exit 0
 - SUG:NA
 - DESC:add ExecStartPost in sendmail.service

-* Wed May 12 2021 liulong <liulong20@huawei.com> - 8.16.1-5
+* Wed May 12 liulong <liulong20@huawei.com> - 8.16.1-5
 - Type:bugfix
 - ID:NA
 - SUG:NA