diff --git a/Sendmail-sasl1.conf b/Sendmail-sasl1.conf new file mode 100644 index 0000000..44af343 --- /dev/null +++ b/Sendmail-sasl1.conf @@ -0,0 +1 @@ +pwcheck_method:pam diff --git a/Sendmail-sasl2.conf b/Sendmail-sasl2.conf new file mode 100644 index 0000000..74ef83f --- /dev/null +++ b/Sendmail-sasl2.conf @@ -0,0 +1 @@ +pwcheck_method:saslauthd diff --git a/sendmail.spec b/sendmail.spec index 8010231..00cb954 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -1,5 +1,3 @@ -ExcludeArch: ppc ppc64 - # package options %define with_fsl no %define with_tls yes @@ -9,6 +7,9 @@ ExcludeArch: ppc ppc64 %define with_ldap yes %define with_mysql no +%define enable_pie yes +%define old_setup no + %define sendmailcf usr/share/sendmail-cf %define stdir /var/log/mail %define smshell /sbin/nologin @@ -17,19 +18,23 @@ ExcludeArch: ppc ppc64 Summary: A widely used Mail Transport Agent (MTA). Name: sendmail Version: 8.12.11 -Release: 2 +Release: 4 License: Sendmail Group: System Environment/Daemons Provides: smtpdaemon Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz Source1: sendmail.init +%if "%{old_setup}" == "yes" +Source3: aliases +%endif Source4: sendmail.sysconfig Source5: sendmail.etc-mail-Makefile Source6: sendmail-redhat.mc -Source7: Sendmail.conf +Source7: Sendmail-sasl1.conf Source8: sendmail.pam Source9: sendmail-8.12.5-newconfig.readme Source10: makecert.sh +Source11: Sendmail-sasl2.conf Patch3: sendmail-8.12.2-makemapman.patch Patch4: sendmail-8.12.11-smrsh-paths.patch Patch5: sendmail-8.12.2-movefiles.patch @@ -38,7 +43,6 @@ Patch9: sendmail-8.12.7-hesiod.patch Patch10: sendmail-8.12.7-manpage.patch Patch11: sendmail-8.12.9-dynamic.patch Buildroot: %{_tmppath}/%{name}-root -BuildRequires: gdbm-devel BuildRequires: tcp_wrappers BuildRequires: db4-devel BuildRequires: hesiod-devel @@ -50,9 +54,11 @@ PreReq: chkconfig >= 1.3 PreReq: /usr/sbin/useradd /bin/mktemp fileutils gawk sed sh-utils Requires: procmail Requires: bash >= 2.0 +%if "%{old_setup}" != "yes" Requires: setup >= 2.5.31-1 BuildRequires: setup >= 2.5.31-1 #Requires: /etc/aliases +%endif %if "%{with_fsl}" == "yes" BuildRequires: fsl >= 1.2.0 PreReq: fsl >= 1.2.0 @@ -130,10 +136,10 @@ your sendmail.cf file. # generate redhat config file cat > redhat.config.m4 << EOF define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX') -define(\`confOPTIMIZE', \`${RPM_OPT_FLAGS} -fpie') +define(\`confOPTIMIZE', \`${RPM_OPT_FLAGS}') define(\`confENVDEF', \`-I/usr/include/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_WORKAROUND_BROKEN_NAMESERVERS -D_FFR_SMTP_SSL') define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib}') -define(\`confLIBS', \`-pie -lnsl -lwrap -lhesiod -lcrypt -ldb') +define(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb') define(\`confMANOWN', \`root') define(\`confMANGRP', \`root') define(\`confMANMODE', \`644') @@ -144,6 +150,25 @@ define(\`confSTDIR', \`%{stdir}') define(\`STATUS_FILE', \`%{stdir}/statistics') EOF +%ifarch ppc ppc64 +cat >> redhat.config.m4 << EOF +APPENDDEF(\`confOPTIMIZE', \`-DSM_CONF_SHM=0') +EOF +# %define enable_pie no +%endif + +%if "%{enable_pie}" == "yes" +%ifarch s390 s390x +%define _fpie -fPIE +%else +%define _fpie -fpie +%endif +cat >> redhat.config.m4 << EOF +APPENDDEF(\`confOPTIMIZE', \`%{_fpie}') +APPENDDEF(\`confLIBS', \`-pie') +EOF +%endif + %if "%{with_tls}" == "yes" cat >> redhat.config.m4 << EOF APPENDDEF(\`conf_sendmail_ENVDEF', \`-DSTARTTLS')dnl @@ -187,11 +212,6 @@ APPENDDEF(\`confLIBS',\`%{l_ldflags mysql .} -lmysqlclient -lz -lm')dnl EOF %endif -%ifarch s390 s390x -# Avoid GOT overflows -perl -pi -e 's/-fpie/-fPIE/' devtools/OS/Linux redhat.config.m4 -%endif - DIRS="libsmutil sendmail mailstats rmail praliases smrsh makemap" %if "%{with_milter}" == "yes" @@ -320,7 +340,12 @@ for map in virtusertable access domaintable mailertable ; do $RPM_BUILD_ROOT%{_bindir}/makemap -C $RPM_BUILD_ROOT/etc/mail/sendmail.cf hash $RPM_BUILD_ROOT/etc/mail/${map}.db < $RPM_BUILD_ROOT/etc/mail/${map} chmod 0644 $RPM_BUILD_ROOT/etc/mail/${map}.db done +%if "%{old_setup}" == "yes" +install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/aliases +$RPM_BUILD_ROOT/usr/bin/makemap -C $RPM_BUILD_ROOT/etc/mail/sendmail.cf hash $RPM_BUILD_ROOT/etc/aliases.db < %{SOURCE3} +%else $RPM_BUILD_ROOT/usr/bin/makemap -C $RPM_BUILD_ROOT/etc/mail/sendmail.cf hash $RPM_BUILD_ROOT/etc/aliases.db < /etc/aliases +%endif install -m644 %SOURCE4 $RPM_BUILD_ROOT/etc/sysconfig/sendmail install -m755 %SOURCE1 $RPM_BUILD_ROOT%{initdir}/sendmail @@ -336,7 +361,7 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/sasl/Sendmail.conf %endif %if "%{with_sasl2}" == "yes" install -m755 -d $RPM_BUILD_ROOT%{_libdir}/sasl2 -install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/sasl2/Sendmail.conf +install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/sasl2/Sendmail.conf %endif install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/smtp.sendmail @@ -355,6 +380,7 @@ done mv $RPM_BUILD_ROOT%{_mandir}/man1/mailq.1 $RPM_BUILD_ROOT%{_mandir}/man1/mailq.sendmail.1 mv $RPM_BUILD_ROOT%{_mandir}/man1/newaliases.1 $RPM_BUILD_ROOT%{_mandir}/man1/newaliases.sendmail.1 mv $RPM_BUILD_ROOT%{_mandir}/man5/aliases.5 $RPM_BUILD_ROOT%{_mandir}/man5/aliases.sendmail.5 +mv $RPM_BUILD_ROOT%{_mandir}/man8/sendmail.8 $RPM_BUILD_ROOT%{_mandir}/man8/sendmail.sendmail.8 %if "%{stdir}" != "/etc/mail" perl -pi -e 's:/etc/mail/statistics:%{stdir}/statistics:' $RPM_BUILD_ROOT%{_mandir}/man*/* @@ -423,6 +449,7 @@ fi --slave %{_bindir}/rmail mta-rmail %{_bindir}/rmail.sendmail \ --slave /usr/lib/sendmail mta-sendmail /usr/lib/sendmail.sendmail \ --slave %{_sysconfdir}/pam.d/smtp mta-pam %{_sysconfdir}/pam.d/smtp.sendmail \ + --slave %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man8/mailq.sendmail.sendmail.8.gz \ --slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man1/mailq.sendmail.1.gz \ --slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/newaliases.sendmail.1.gz \ --slave %{_mandir}/man5/aliases.5.gz mta-aliasesman %{_mandir}/man5/aliases.sendmail.5.gz \ @@ -486,7 +513,7 @@ exit 0 %{_mandir}/man8/praliases.8* %{_mandir}/man8/mailstats.8* %{_mandir}/man8/makemap.8* -%{_mandir}/man8/sendmail.8* +%{_mandir}/man8/sendmail.sendmail.8* %{_mandir}/man8/smrsh.8* %{_mandir}/man5/aliases.sendmail.5* %{_mandir}/man1/newaliases.sendmail.1* @@ -498,7 +525,9 @@ exit 0 %attr(0644,root,root) %config(noreplace) /etc/mail/sendmail.mc %attr(0644,root,root) %config(noreplace) /etc/mail/submit.mc %config(noreplace) /etc/mail/local-host-names -#%config(noreplace) /etc/aliases +%if "%{old_setup}" == "yes" +%config(noreplace) /etc/aliases +%endif %attr(0644,root,root) %ghost /etc/aliases.db %attr(0770,smmsp,smmsp) %dir /var/spool/clientmqueue %attr(0700,root,mail) %dir /var/spool/mqueue @@ -525,7 +554,7 @@ exit 0 %config %{initdir}/sendmail -%config %{_libdir}/sasl*/Sendmail.conf +%config %{_libdir}/sasl*/Sendmail*.conf %config(noreplace) /etc/pam.d/smtp.sendmail %files cf @@ -544,6 +573,22 @@ exit 0 %{_docdir}/sendmail %changelog +* Wed Mar 17 2004 Thomas Woerner 8.2.11-4 +- new slave in alternatives for sendmail man page + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Thu Feb 19 2004 Thomas Woerner 8.2.11-3.2 +- removed buildreq for gdbm-devel + +* Thu Feb 19 2004 Thomas Woerner 8.2.11-3 +- RH3.0E version: sasl1, no pie, old_setup (provide /etc/aliases) +- new switches for pie and old_setup + +* Thu Feb 5 2004 Thomas Woerner 8.2.11-2.1 +- new Sendmail.conf for sasl1 (#114726) + * Wed Jan 28 2004 Thomas Woerner 8.2.11-2 - added information for saslauthd and AUTH (#113463) - fixed STATUS_FILE in sendmail-redhat.mc (#114302)