From 05fa9f4e85dc5d8ca363847c53866f580ae84b97 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 12:14:48 +0000 Subject: auto-import sendmail-8.11.6-14 from sendmail-8.11.6-14.src.rpm --- diff --git a/sendmail-redhat.mc b/sendmail-redhat.mc index c656155..7e56617 100644 --- a/sendmail-redhat.mc +++ b/sendmail-redhat.mc @@ -8,6 +8,9 @@ dnl include(`@@PATH@@/m4/cf.m4') VERSIONID(`linux setup for Red Hat Linux')dnl OSTYPE(`linux') +dnl Uncomment and edit the following line if your mail needs to be sent out +dnl through an external mail server: +dnl define(`SMART_HOST',`smtp.your.provider') define(`confDEF_USER_ID',``8:12'')dnl undefine(`UUCP_RELAY')dnl undefine(`BITNET_RELAY')dnl diff --git a/sendmail.etc-mail-Makefile b/sendmail.etc-mail-Makefile index 4cdc56d..152026b 100644 --- a/sendmail.etc-mail-Makefile +++ b/sendmail.etc-mail-Makefile @@ -10,9 +10,6 @@ POSSIBLE += $(shell test -f userdb && echo userdb.db) all: ${POSSIBLE} virtusertable.db access.db domaintable.db mailertable.db -virtusertable.db : virtusertable - @makemap -f hash $@ < $< - userdb.db : userdb @makemap btree $@ < $< diff --git a/sendmail.spec b/sendmail.spec index f568890..67c30cf 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -2,8 +2,8 @@ # If you want to build this on older Red Hat Linux releases, this defines # the version number to build on. Supported should be 62 70 71 72 for # Red Hat Linux 6.2 up to 7.2 and "100" for the current rawhide version. -%define errata 72 -%define release 9 +%define errata 100 +%define release 14 %if %{errata} <= 70 %define sendmailcf usr/lib/sendmail-cf @@ -17,9 +17,9 @@ Version: 8.11.6 %if %{errata} == 100 Release: %{release} %else -Release: %{release}.%{errata}.2 +Release: %{release}.%{errata} %endif -Copyright: BSD +License: BSD Group: System Environment/Daemons Provides: smtpdaemon Source0: ftp://ftp.cs.berkeley.edu/ucb/sendmail/sendmail.%{version}.tar.gz @@ -35,6 +35,7 @@ Patch1: sendmail-8.11.0-redhat.patch2 Patch2: sendmail-8.10.0-makemapman.patch Patch3: sendmail-8.10.0-smrsh-paths.patch Patch4: sendmail-8.10.1-movefiles.patch +Patch5: sendmail-8.12.2-unix.patch Buildroot: %{_tmppath}/%{name}-root BuildRequires: gdbm-devel %if %{errata} > 62 @@ -43,15 +44,20 @@ BuildRequires: cyrus-sasl %else BuildRequires: cyrus-sasl-devel %endif -%if %{errata} == 100 -BuildRequires: db4-devel -%else BuildRequires: db3-devel -%endif BuildRequires: openldap-devel tcp_wrappers %endif -Prereq: /sbin/chkconfig /usr/sbin/useradd +%if %{errata} == 100 +Prereq: /usr/sbin/alternatives +Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz %{_mandir}/man1/newaliases.1.gz %{_mandir}/man5/aliases.5.gz +Prereq: chkconfig >= 1.3 +%else +Prereq: /sbin/chkconfig +%endif +Prereq: /usr/sbin/useradd /bin/mktemp fileutils gawk sed sh-utils +%if %{errata} < 100 Conflicts: postfix exim +%endif Requires: procmail %if %{errata} > 62 Requires: bash >= 2.0 @@ -106,35 +112,40 @@ your sendmail.cf file. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build -cd libmilter +pushd libmilter sh Build -f ../redhat.config.m4 -cd .. +popd + +#pushd libsmutil +#sh Build -f ../redhat.config.m4 +#popd -cd sendmail +pushd sendmail sh Build -f ../redhat.config.m4 -cd .. +popd -cd mailstats +pushd mailstats sh Build -f ../redhat.config.m4 -cd .. +popd -cd rmail +pushd rmail sh Build -f ../redhat.config.m4 -cd .. +popd -cd makemap +pushd praliases sh Build -f ../redhat.config.m4 -cd .. +popd -cd praliases +pushd smrsh sh Build -f ../redhat.config.m4 -cd .. +popd -cd smrsh +pushd makemap sh Build -f ../redhat.config.m4 -cd .. +popd %install rm -rf $RPM_BUILD_ROOT @@ -142,7 +153,7 @@ mkdir -p $RPM_BUILD_ROOT cd $RPM_BUILD_ROOT mkdir -p etc/sysconfig $RPM_BUILD_ROOT%{initdir} etc/pam.d -mkdir -p usr/bin usr/include usr/lib .%{_mandir}/man{1,5,8} usr/sbin var/log +mkdir -p usr/bin usr/include/libmilter usr/lib .%{_mandir}/man{1,5,8} usr/sbin var/log mkdir -p var/spool %{sendmailcf} cd - @@ -167,10 +178,10 @@ make $XX INCOWN=`id -nu` INCGRP=`id -ng` LIBOWN=`id -nu` LIBGRP=`id -ng` \ DOC=$RPM_BUILD_ROOT%{_docdir}/sendmail mkdir -p $DOC cp -ar FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc $DOC -cp sendmail/README $DOC/README.sendmail -cp smrsh/README $DOC/README.smrsh -cp libmilter/README $DOC/README.libmilter -cp cf/README $DOC/README.cf +cp sendmail/README $DOC/README.sendmail +cp smrsh/README $DOC/README.smrsh +cp libmilter/README $DOC/README.libmilter +cp cf/README $DOC/README.cf # install the cf files pushd cf @@ -250,6 +261,18 @@ install -m 755 -d $RPM_BUILD_ROOT%{_libdir} install -m 644 $OBJDIR/libmilter/libmilter.a $RPM_BUILD_ROOT%{_libdir} install -m 644 $OBJDIR/libsmutil/libsmutil.a $RPM_BUILD_ROOT%{_libdir} +%if %{errata} == 100 +mv $RPM_BUILD_ROOT%{_sbindir}/sendmail $RPM_BUILD_ROOT%{_sbindir}/sendmail.sendmail +for i in mailq newaliases rmail; do + mv $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT%{_bindir}/$i.sendmail +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 +%endif + +mv $RPM_BUILD_ROOT%{_includedir}/*.h $RPM_BUILD_ROOT%{_includedir}/libmilter + %clean rm -rf $RPM_BUILD_ROOT @@ -281,6 +304,23 @@ for oldfile in relay_allow ip_allow name_allow ; do fi done +/sbin/chkconfig --add sendmail + +%if %{errata} == 100 +# +# Set up the alternatives files for MTAs. +# +/usr/sbin/alternatives --install %{_sbindir}/sendmail mta %{_sbindir}/sendmail.sendmail 90 \ + --slave %{_bindir}/mailq mta-mailq %{_bindir}/mailq.sendmail \ + --slave %{_bindir}/newaliases mta-newaliases %{_bindir}/newaliases.sendmail \ + --slave %{_bindir}/rmail mta-rmail %{_bindir}/rmail.sendmail \ + --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 \ + --initscript sendmail +%endif + + # # Oops, these files moved # @@ -309,23 +349,39 @@ fi if [ $1 = 0 ]; then %{initdir}/sendmail stop >/dev/null 2>&1 /sbin/chkconfig --del sendmail +%if %{errata} == 100 + /usr/sbin/alternatives --remove mta %{_sbindir}/sendmail.sendmail +%endif fi +exit 0 %triggerpostun -- sendmail < 8.10.0 /sbin/chkconfig --add sendmail +%if %{errata} == 100 +%triggerpostun -- sendmail < 8.11.6-11 +/usr/sbin/alternatives --auto mta +%endif + %files %defattr(-,root,root) /usr/sbin/mailstats /usr/sbin/praliases /usr/bin/hoststat /usr/bin/purgestat -/usr/bin/rmail /usr/bin/makemap /usr/sbin/makemap +%if %{errata} == 100 +/usr/bin/rmail.sendmail +/usr/sbin/sendmail.sendmail +/usr/bin/newaliases.sendmail +/usr/bin/mailq.sendmail +%else +/usr/bin/rmail /usr/sbin/sendmail /usr/bin/newaliases /usr/bin/mailq +%endif /usr/sbin/smrsh /usr/lib/sendmail @@ -335,9 +391,15 @@ fi %{_mandir}/man8/makemap.8* %{_mandir}/man8/sendmail.8* %{_mandir}/man8/smrsh.8* +%if %{errata} == 100 +%{_mandir}/man5/aliases.sendmail.5* +%{_mandir}/man1/newaliases.sendmail.1* +%{_mandir}/man1/mailq.sendmail.1* +%else %{_mandir}/man5/aliases.5* %{_mandir}/man1/newaliases.1* %{_mandir}/man1/mailq.1* +%endif %config(noreplace) /etc/mail/statistics %config(noreplace) /etc/sendmail.cf @@ -380,20 +442,35 @@ fi %files devel %defattr(-,root,root) -/usr/include/*.h -/usr/lib/libmilter.a -/usr/lib/libsmutil.a +%{_includedir}/libmilter/*.h +%{_libdir}/libmilter.a +%{_libdir}/libsmutil.a %files doc %defattr(-,root,root) %{_docdir}/sendmail %changelog -* Fri May 03 2002 Philip Copeland 8.11.6-9.72.2 -- rebuild for alpha - -* Mon Mar 25 2002 Nalin Dahyabhai 8.11.6-9.72.1 -- rebuild +* Wed Mar 27 2002 Florian La Roche +- backport from 8.12.2 rpm: + - no special virtusertable entry in /etc/mail/Makefile + - some additions to sendmail.mc file + - add sendmail-8.12.2-unix.patch + - alternatives fixes + +* Wed Feb 20 2002 Florian La Roche +- add proper ifdefs around new alternative stuff to also be able + to build this for older releases + +* Fri Feb 1 2002 Bill Nottingham 8.11.6-12 +- %triggerpostun on older versions to make sure alternatives work on + upgrades + +* Thu Jan 31 2002 Bill Nottingham 8.11.6-11 +- clean up alternatives somewhat, provide /usr/sbin/sendmail & friends + +* Thu Jan 31 2002 Bernhard Rosenkraenzer 8.11.6-10 +- Use alternatives * Tue Jan 22 2002 Florian La Roche - fix quotation in spec-file