Attachment 148408 Details for Bug 226407 – Patch implementing most of the following review suggestions

[patch] Patch implementing most of the following review suggestions

sendmail-suggestions.patch (text/plain), 39.69 KB, created by Paul Howarth on 2007-02-20 11:58:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Howarth

Created: 2007-02-20 11:58:06 UTC

Size: 39.69 KB

patch

obsolete

>Index: sendmail.spec
>===================================================================
>RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
>retrieving revision 1.78
>diff -u -r1.78 sendmail.spec
>--- sendmail.spec	6 Feb 2007 16:15:48 -0000	1.78
>+++ sendmail.spec	20 Feb 2007 11:46:59 -0000
>@@ -1,88 +1,108 @@
> ##   package options
>-%define       with_fsl      no
>-%define       with_tls      yes
>-%define       with_sasl1    no
>-%define       with_sasl2    yes
>-%define       with_milter   yes
>-%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
>-%define initdir /etc/rc.d/init.d
>-
>-Summary: A widely used Mail Transport Agent (MTA).
>-Name: sendmail
>-Version: 8.14.0
>-Release: 1
>-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-sasl1.conf
>-Source8: sendmail.pam
>-Source9: sendmail-8.12.5-newconfig.readme
>+%define with_fsl      no
>+%define with_tls      yes
>+%define with_sasl1    no
>+%define with_sasl2    yes
>+%define with_milter   yes
>+%define with_ldap     yes
>+%define with_mysql    no
>+
>+%define enable_pie    yes
>+%define old_setup     no
>+
>+%define sendmailcf %{_datadir}/sendmail-cf
>+%define stdir      /var/log/mail
>+%define smshell    /sbin/nologin
>+%define initdir    %{_initrddir}
>+
>+Summary:  A widely used Mail Transport Agent (MTA)
>+Name:     sendmail
>+Version:  8.14.0
>+Release:  1
>+License:  Sendmail
>+Group:    System Environment/Daemons
>+URL:      http://www.sendmail.org/
>+
>+Source0:  ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz
>+Source1:  sendmail.init
>+Source3:  sendmail-etc-aliases
>+Source4:  sendmail.sysconfig
>+Source5:  sendmail-etc-mail-Makefile
>+Source6:  sendmail-redhat.mc
>+Source7:  Sendmail-sasl1.conf
>+Source8:  sendmail.pam
>+Source9:  sendmail-8.12.5-newconfig.readme
> Source11: Sendmail-sasl2.conf
>-Patch3: sendmail-8.14.0-makemapman.patch
>-Patch4: sendmail-8.13.2-smrsh-paths.patch
>-Patch5: sendmail-8.12.2-movefiles.patch
>-Patch7: sendmail-8.13.7-pid.patch
>-Patch9: sendmail-8.12.7-hesiod.patch
>-Patch10: sendmail-8.12.7-manpage.patch
>-Patch11: sendmail-8.14.0-dynamic.patch
>-Patch12: sendmail-8.13.0-cyrus.patch
>-Patch13: sendmail-8.13.7-aliases_dir.patch
>-Patch14: sendmail-8.13.7-vacation.patch
>-Patch15: sendmail-8.13.8-noversion.patch
>-Buildroot: %{_tmppath}/%{name}-root
>+Source20: sendmail-etc-mail-access
>+Source21: sendmail-etc-mail-domaintable
>+Source22: sendmail-etc-mail-local-host-names
>+Source23: sendmail-etc-mail-mailertable
>+Source24: sendmail-etc-mail-trusted-users
>+Source25: sendmail-etc-mail-virtusertable
>+Patch3:   sendmail-8.14.0-makemapman.patch
>+Patch4:   sendmail-8.13.2-smrsh-paths.patch
>+Patch5:   sendmail-8.12.2-movefiles.patch
>+Patch7:   sendmail-8.13.7-pid.patch
>+Patch9:   sendmail-8.12.7-hesiod.patch
>+Patch10:  sendmail-8.12.7-manpage.patch
>+Patch11:  sendmail-8.14.0-dynamic.patch
>+Patch12:  sendmail-8.13.0-cyrus.patch
>+Patch13:  sendmail-8.13.7-aliases_dir.patch
>+Patch14:  sendmail-8.13.7-vacation.patch
>+Patch15:  sendmail-8.13.8-noversion.patch
>+Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires: tcp_wrappers-devel
> BuildRequires: db4-devel
> BuildRequires: hesiod-devel
> BuildRequires: groff
> BuildRequires: m4
>-PreReq: /usr/sbin/alternatives
>-Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
>-Provides: %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz
>-Provides: %{_mandir}/man1/newaliases.1.gz %{_mandir}/man5/aliases.5.gz
>-PreReq: chkconfig >= 1.3
>-PreReq: /usr/sbin/useradd /bin/mktemp fileutils gawk sed sh-utils
>+BuildRequires: symlinks
>+
>+Provides: /etc/pam.d/smtp
>+Provides: /usr/lib/sendmail
>+Provides: %{_sbindir}/sendmail
>+Provides: %{_bindir}/mailq
>+Provides: %{_bindir}/newaliases
>+Provides: %{_bindir}/rmail
>+Provides: %{_mandir}/man1/mailq.1.gz
>+Provides: %{_mandir}/man1/newaliases.1.gz
>+Provides: %{_mandir}/man5/aliases.5.gz
>+Provides: %{_mandir}/man8/sendmail.8.gz
>+Provides: smtpdaemon
>+PreReq:   /usr/sbin/alternatives
>+PreReq:   chkconfig >= 1.3
> Requires: procmail
> Requires: bash >= 2.0
>+Requires(pre):    /usr/sbin/useradd
>+Requires(post):   /bin/mktemp
>+Requires(postun): coreutils
>+Requires(post):   coreutils gawk sed
>+
> %if "%{old_setup}" != "yes"
>-Requires: setup >= 2.5.31-1
>-BuildRequires: setup >= 2.5.31-1
>-#Requires: /etc/aliases
>+BuildRequires:  setup >= 2.5.31-1
>+Requires:       setup >= 2.5.31-1
> %endif
>+
> %if "%{with_fsl}" == "yes"
> BuildRequires:  fsl >= 1.2.0
>-PreReq:       fsl >= 1.2.0
>+Requires:       fsl >= 1.2.0
> %endif
>+
> %if "%{with_tls}" == "yes"
> BuildRequires:  openssl-devel
>-PreReq:       openssl
> %endif
>+
> %if "%{with_sasl1}" == "yes" || "%{with_sasl2}" == "yes"
> BuildRequires:  cyrus-sasl-devel, openssl-devel
>-PreReq:       /usr/sbin/saslauthd, openssl
>+Requires:       /usr/sbin/saslauthd
> %endif
>+
> %if "%{with_ldap}" == "yes"
> BuildRequires:  openldap-devel, openssl-devel
>-PreReq:       openldap, openssl
> %endif
>+
> %if "%{with_mysql}" == "yes"
> BuildRequires:  mysql-devel
>-PreReq:       mysql
> %endif
> 
> 
>@@ -98,7 +118,7 @@
> Sendmail, you can install the sendmail-doc package.
> 
> %package doc
>-Summary: Documentation about the Sendmail Mail Transport Agent program.
>+Summary: Documentation about the Sendmail Mail Transport Agent program
> Group: Documentation
> Requires: sendmail = %{version}-%{release}
> 
>@@ -109,8 +129,8 @@
> provided in PostScript(TM) and troff formats.
> 
> %package devel
>-Summary: Extra development include files and development files.
>-Group: System Environment/Daemons
>+Summary: Extra development include files and development files
>+Group: Development/Libraries
> Requires: sendmail = %{version}-%{release}
> 
> %description devel
>@@ -118,7 +138,7 @@
> of sendmail.
> 
> %package cf
>-Summary: The files needed to reconfigure Sendmail.
>+Summary: The files needed to reconfigure Sendmail
> Group: System Environment/Daemons
> Requires: sendmail = %{version}-%{release}
> Requires: m4
>@@ -149,7 +169,7 @@
> cat > redhat.config.m4 << EOF
> define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
> 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 -D_FFR_TLS_1')
>+define(\`confENVDEF', \`-I/usr/include/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_TLS_1')
> define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib}')
> define(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb')
> define(\`confMANOWN', \`root')
>@@ -163,11 +183,6 @@
> define(\`confLIBSEARCH', \`db resolv 44bsd')
> EOF
> 
>-# block mail from http proxies
>-#cat >> redhat.config.m4 << EOF
>-#APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_BLOCK_PROXIES')
>-#EOF
>-
> %ifarch ppc ppc64 s390x
> cat >> redhat.config.m4 << EOF
> APPENDDEF(\`confOPTIMIZE', \`-DSM_CONF_SHM=0')
>@@ -195,14 +210,14 @@
> 
> %if "%{with_sasl1}" == "yes"
> cat >> redhat.config.m4 << EOF
>-APPENDDEF(\`confENVDEF', \`-DSASL=1 -D_FFR_UNSAFE_SASL')dnl
>+APPENDDEF(\`confENVDEF', \`-DSASL=1')dnl
> APPENDDEF(\`confLIBS', \`-lsasl -lcrypto')dnl
> EOF
> %endif
> 
> %if "%{with_sasl2}" == "yes"
> cat >> redhat.config.m4 << EOF
>-APPENDDEF(\`confENVDEF', \`-DSASL=2 -D_FFR_UNSAFE_SASL')dnl
>+APPENDDEF(\`confENVDEF', \`-DSASL=2')dnl
> APPENDDEF(\`confLIBS', \`-lsasl2 -lcrypto')dnl
> EOF
> %endif
>@@ -210,7 +225,6 @@
> %if "%{with_milter}" == "yes"
> cat >> redhat.config.m4 << EOF
> APPENDDEF(\`conf_sendmail_ENVDEF', \`-DMILTER')dnl
>-APPENDDEF(\`conf_libmilter_ENVDEF', \`-D_FFR_MILTER_ROOT_UNSAFE')dnl
> EOF
> %endif
> 
>@@ -236,40 +250,50 @@
> %endif
> 
> for i in $DIRS; do
>-	pushd $i
>-	sh Build -f ../redhat.config.m4
>-	popd
>+  pushd $i
>+  sh Build -f ../redhat.config.m4
>+  popd
> done
> 
> %install
> rm -rf $RPM_BUILD_ROOT
>-mkdir -p $RPM_BUILD_ROOT
> 
>-cd $RPM_BUILD_ROOT
>-mkdir -p etc/sysconfig .%{initdir} etc/pam.d
>-mkdir -p usr/bin usr/include/libmilter usr/%{_lib} usr/lib
>-mkdir -p .%{_mandir}/man{1,5,8}
>-mkdir -p usr/sbin var/log var/spool .%{sendmailcf}
>-cd -
>+# Create target directories in buildroot
>+mkdir -p \
>+  $RPM_BUILD_ROOT/etc/mail \
>+  $RPM_BUILD_ROOT/etc/pam.d \
>+  $RPM_BUILD_ROOT%{initdir} \
>+  $RPM_BUILD_ROOT/etc/sysconfig \
>+  $RPM_BUILD_ROOT%{_bindir} \
>+  $RPM_BUILD_ROOT%{_includedir}/libmilter \
>+  $RPM_BUILD_ROOT/usr/lib \
>+  $RPM_BUILD_ROOT%{_libdir} \
>+  $RPM_BUILD_ROOT%{_mandir}/man{1,5,8} \
>+  $RPM_BUILD_ROOT%{_sbindir} \
>+  $RPM_BUILD_ROOT%{sendmailcf} \
>+  $RPM_BUILD_ROOT/var/log \
>+  $RPM_BUILD_ROOT/var/spool
> 
>-OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
>+# Don't attempt to set file ownerships to final values yet - use ID of builder
>+# instead so as not to break non-root builds
> nameuser=`id -nu`
> namegroup=`id -ng`
>-
> Make() {
>-	make $@ \
>-		DESTDIR=$RPM_BUILD_ROOT \
>-		MANROOT=%{_mandir}/man \
>-		SBINOWN=${nameuser} SBINGRP=${namegroup} \
>-		UBINOWN=${nameuser} UBINGRP=${namegroup} \
>-		MANOWN=${nameuser}  MANGRP=${namegroup} \
>-		INCOWN=${nameuser}  INCGRP=${namegroup} \
>-		LIBOWN=${nameuser}  LIBGRP=${namegroup} \
>-		GBINOWN=${nameuser} GBINGRP=${namegroup} \
>-		CFOWN=${nameuser}   CFGRP=${namegroup} \
>-		MSPQOWN=${nameuser} 
>+  make $@ \
>+    DESTDIR=$RPM_BUILD_ROOT \
>+    MANROOT=%{_mandir}/man \
>+    SBINOWN=${nameuser} SBINGRP=${namegroup} \
>+    UBINOWN=${nameuser} UBINGRP=${namegroup} \
>+    MANOWN=${nameuser}  MANGRP=${namegroup} \
>+    INCOWN=${nameuser}  INCGRP=${namegroup} \
>+    LIBOWN=${nameuser}  LIBGRP=${namegroup} \
>+    GBINOWN=${nameuser} GBINGRP=${namegroup} \
>+    CFOWN=${nameuser}   CFGRP=${namegroup} \
>+    MSPQOWN=${nameuser}
> }
> 
>+# Use upstream install routines for libraries and programs
>+OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
> Make install -C $OBJDIR/libmilter
> Make install -C $OBJDIR/libsmutil
> Make install -C $OBJDIR/sendmail
>@@ -279,133 +303,114 @@
> Make install -C $OBJDIR/smrsh
> Make install -C $OBJDIR/makemap
> 
>-touch $RPM_BUILD_ROOT/rootfile
>-root=..
>-while [ ! -r $RPM_BUILD_ROOT/%{_bindir}/${root}/rootfile ] ; do
>-	root=${root}/..
>-done
>-ln -sf ${root}%{_sbindir}/makemap $RPM_BUILD_ROOT/%{_bindir}/makemap
>-
> # Install docs by hand for the sendmail-doc package.
> 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 sendmail/SECURITY $DOC/SECURITY
>-cp smrsh/README      $DOC/README.smrsh
>-cp libmilter/README  $DOC/README.libmilter
>-cp cf/README         $DOC/README.cf
>-cp %{SOURCE9}        $DOC/README.redhat
>+cp -ar doc $DOC
>+cp -a sendmail/README   $DOC/README.sendmail
>+cp -a sendmail/SECURITY $DOC/SECURITY
>+cp -a smrsh/README      $DOC/README.smrsh
>+cp -a libmilter/README  $DOC/README.libmilter
>+cp -a cf/README         $DOC/README.cf
>+cp -a %{SOURCE9}        $DOC/README.redhat
> 
> # Install the cf files for the sendmail-cf package.
> cp -ar cf/* $RPM_BUILD_ROOT%{sendmailcf}
>-# remove patch backup files
>+# remove patch backup files and other files not to be packaged in the cf package
> rm -rf $RPM_BUILD_ROOT%{sendmailcf}/cf/Build.*
>+rm -rf $RPM_BUILD_ROOT%{sendmailcf}/cf/README
> rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.mc.*
> rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.m4.*
> 
>-install -d -m755 $RPM_BUILD_ROOT/etc/mail
>-
>+# Create the default config files and maps
> sed -e 's|@@PATH@@|%{sendmailcf}|' < %{SOURCE6} > $RPM_BUILD_ROOT/etc/mail/sendmail.mc
>-
>+chmod 644 $RPM_BUILD_ROOT/etc/mail/sendmail.mc
> sed -e 's|%{sendmailcf}|\.\.|' < $RPM_BUILD_ROOT/etc/mail/sendmail.mc > cf/cf/redhat.mc
> %if "%{stdir}" != "/etc/mail"
>-perl -pi -e 's:/etc/mail/statistics:%{stdir}/statistics:' cf/cf/redhat.mc
>+sed -i -e 's:/etc/mail/statistics:%{stdir}/statistics:' cf/cf/redhat.mc
> %endif
> (cd cf/cf && m4 redhat.mc > redhat.cf)
> install -m 644 cf/cf/redhat.cf $RPM_BUILD_ROOT/etc/mail/sendmail.cf
> install -m 644 cf/cf/submit.mc $RPM_BUILD_ROOT/etc/mail/submit.mc
>-
>-echo "# local-host-names - include all aliases for your machine here." \
>-	> $RPM_BUILD_ROOT/etc/mail/local-host-names
>-( echo "# trusted-users - users that can send mail as others without a warning"
>-echo "# apache, mailman, majordomo, uucp, are good candidates" ) \
>-	> $RPM_BUILD_ROOT/etc/mail/trusted-users
>-
>-ln -sf ../sbin/sendmail $RPM_BUILD_ROOT/usr/lib/sendmail.sendmail
>-install -d -m775 $RPM_BUILD_ROOT/var/spool/mqueue
>-install -d -m755 $RPM_BUILD_ROOT/var/spool/clientmqueue
>-
>-# dangling symlinks
>-root=..
>-while [ ! -r $RPM_BUILD_ROOT/%{_bindir}/${root}/rootfile ] ; do
>-	root=${root}/..
>-done
>-for f in hoststat mailq newaliases purgestat ; do
>-    ln -sf ${root}%{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/${f}
>-done
>-install -d -m755 $RPM_BUILD_ROOT/etc/smrsh
>-
>-cat <<EOF > $RPM_BUILD_ROOT/etc/mail/access
>-# Check the /usr/share/doc/sendmail/README.cf file for a description
>-# of the format of this file. (search for access_db in that file)
>-# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
>-# package.
>-#
>-# by default we allow relaying from localhost...
>-Connect:localhost.localdomain		RELAY
>-Connect:localhost			RELAY
>-Connect:127.0.0.1			RELAY
>-
>-EOF
>-for map in virtusertable access domaintable mailertable ; do
>-    touch $RPM_BUILD_ROOT/etc/mail/${map}
>-    chmod 0644 $RPM_BUILD_ROOT/etc/mail/${map}
>-    $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
>+install -m 644 %{SOURCE5}      $RPM_BUILD_ROOT/etc/mail/Makefile
>+install -m 644 %{SOURCE20}     $RPM_BUILD_ROOT/etc/mail/access
>+install -m 644 %{SOURCE21}     $RPM_BUILD_ROOT/etc/mail/domaintable
>+install -m 644 %{SOURCE22}     $RPM_BUILD_ROOT/etc/mail/local-host-names
>+install -m 644 %{SOURCE23}     $RPM_BUILD_ROOT/etc/mail/mailertable
>+install -m 644 %{SOURCE24}     $RPM_BUILD_ROOT/etc/mail/trusted-users
>+install -m 644 %{SOURCE25}     $RPM_BUILD_ROOT/etc/mail/virtusertable
>+for map in access domaintable mailertable virtusertable; do
>+  $RPM_BUILD_ROOT%{_sbindir}/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}
>+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/aliases
>+$RPM_BUILD_ROOT%{_sbindir}/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
>+$RPM_BUILD_ROOT%{_sbindir}/makemap -C $RPM_BUILD_ROOT/etc/mail/sendmail.cf hash \
>+  $RPM_BUILD_ROOT/etc/aliases.db < /etc/aliases
> %endif
>+chmod 644 $RPM_BUILD_ROOT/etc/aliases.db
> 
>-install -m644 %SOURCE4 $RPM_BUILD_ROOT/etc/sysconfig/sendmail
>-install -m755 %SOURCE1 $RPM_BUILD_ROOT%{initdir}/sendmail
>-
>-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/mail/Makefile
>+# Create queue and restricted shell directories
>+install -d -m 775 $RPM_BUILD_ROOT/var/spool/mqueue
>+install -d -m 755 $RPM_BUILD_ROOT/var/spool/clientmqueue
>+install -d -m 755 $RPM_BUILD_ROOT/etc/smrsh
> 
>-chmod u+w $RPM_BUILD_ROOT/usr/sbin/{mailstats,praliases}
>-chmod u+w $RPM_BUILD_ROOT/usr/bin/rmail
>+# Install initscript
>+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/sendmail
>+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/sendmail
> 
>+# Install cyrus-sasl and pam configs
> %if "%{with_sasl1}" == "yes"
>-install -m755 -d $RPM_BUILD_ROOT%{_libdir}/sasl
>+install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/sasl
> 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 755 -d $RPM_BUILD_ROOT%{_libdir}/sasl2
> install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/sasl2/Sendmail.conf
> %endif
> install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/smtp.sendmail
> 
>-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}
>-install -m 644  $OBJDIR/libsm/libsm.a         $RPM_BUILD_ROOT%{_libdir}
>-
>-# allow stripping of the sendmail app
>-chmod 755 $RPM_BUILD_ROOT%{_sbindir}/sendmail
>-
>-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
>+# Install libraries for development package
>+install -m 644 $OBJDIR/libmilter/libmilter.a $RPM_BUILD_ROOT%{_libdir}
>+install -m 644 $OBJDIR/libsmutil/libsmutil.a $RPM_BUILD_ROOT%{_libdir}
>+install -m 644 $OBJDIR/libsm/libsm.a         $RPM_BUILD_ROOT%{_libdir}
>+# Fix brokenness from upstream if necessary
>+%if "%{_libdir}" != "/usr/lib"
>+rm -fr $RPM_BUILD_ROOT/usr/lib/libmilter.a
>+%endif
>+
>+# Fix permissions of installed binaries for debuginfo extraction
>+chmod 755 $RPM_BUILD_ROOT/usr/sbin/{mailstats,makemap,praliases,sendmail,smrsh}
>+chmod 755 $RPM_BUILD_ROOT/usr/bin/rmail
>+
>+# Have makemap available from %{_bindir} as well as %{_sbindir}
>+ln -sf $RPM_BUILD_ROOT%{_sbindir}/makemap $RPM_BUILD_ROOT%{_bindir}/makemap
>+# Use "alternatives" names for compatibility with other MTA packages
>+# and fix up symlinks to use the new names
>+mv $RPM_BUILD_ROOT%{_sbindir}/sendmail         $RPM_BUILD_ROOT%{_sbindir}/sendmail.sendmail
>+mv $RPM_BUILD_ROOT%{_bindir}/rmail             $RPM_BUILD_ROOT%{_bindir}/rmail.sendmail
>+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
>+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
>+rm -f $RPM_BUILD_ROOT%{_bindir}/mailq
>+rm -f $RPM_BUILD_ROOT%{_bindir}/newaliases
>+ln -sf $RPM_BUILD_ROOT%{_sbindir}/sendmail.sendmail $RPM_BUILD_ROOT/usr/lib/sendmail.sendmail
>+ln -sf $RPM_BUILD_ROOT%{_sbindir}/sendmail.sendmail $RPM_BUILD_ROOT%{_bindir}/hoststat
>+ln -sf $RPM_BUILD_ROOT%{_sbindir}/sendmail.sendmail $RPM_BUILD_ROOT%{_bindir}/mailq.sendmail
>+ln -sf $RPM_BUILD_ROOT%{_sbindir}/sendmail.sendmail $RPM_BUILD_ROOT%{_bindir}/newaliases.sendmail
>+ln -sf $RPM_BUILD_ROOT%{_sbindir}/sendmail.sendmail $RPM_BUILD_ROOT%{_bindir}/purgestat
>+symlinks -cs $RPM_BUILD_ROOT/usr/lib $RPM_BUILD_ROOT%{_bindir}
> 
>+# Fix up file locations in manpages if necessary
> %if "%{stdir}" != "/etc/mail"
>-perl -pi -e 's:/etc/mail/statistics:%{stdir}/statistics:' $RPM_BUILD_ROOT%{_mandir}/man*/*
>+sed -i -e 's:/etc/mail/statistics:%{stdir}/statistics:' $RPM_BUILD_ROOT%{_mandir}/man*/*
> %endif
> 
>-%if "%{_libdir}" == "/usr/lib64"
>-rm -fr $RPM_BUILD_ROOT/usr/lib/libmilter.a
>-%endif
>-
>-rm -rf $RPM_BUILD_ROOT/rootfile
>-
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>@@ -416,31 +421,31 @@
> 
> %postun
> if [ "$1" -ge "1" ]; then
>-	%{initdir}/sendmail condrestart >/dev/null 2>&1
>-	mta=`readlink /etc/alternatives/mta`
>-	if [ "$mta" == "%{_sbindir}/sendmail.sendmail" ]; then
>-		/usr/sbin/alternatives --set mta %{_sbindir}/sendmail.sendmail
>-	fi
>+  %{initdir}/sendmail condrestart >/dev/null 2>&1
>+  mta=`readlink /etc/alternatives/mta`
>+  if [ "$mta" == "%{_sbindir}/sendmail.sendmail" ]; then
>+    /usr/sbin/alternatives --set mta %{_sbindir}/sendmail.sendmail
>+  fi
> fi
> exit 0
> 
> %post
> #
>-# Convert old format to new
>+# Convert old config formats to new
> #
> if [ -f /etc/mail/deny ] ; then
>-    cat /etc/mail/deny | \
>-	awk 'BEGIN{ print "# Entries from obsoleted /etc/mail/deny"} \
>-		  {print $1" REJECT"}' >> /etc/mail/access
>-    cp /etc/mail/deny /etc/mail/deny.rpmorig
>+  cat /etc/mail/deny | \
>+    awk 'BEGIN{ print "# Entries from obsoleted /etc/mail/deny"} \
>+              { print $1" REJECT" }' >> /etc/mail/access
>+  cp /etc/mail/deny /etc/mail/deny.rpmorig
> fi
> for oldfile in relay_allow ip_allow name_allow ; do
>-    if [ -f /etc/mail/$oldfile ] ; then
>-	cat /etc/mail/$oldfile | \
>-		awk "BEGIN { print \"# Entries from obsoleted /etc/mail/$oldfile\" ;} \
>-	     { print \$1\" RELAY\" }" >> /etc/mail/access
>-	cp /etc/mail/$oldfile /etc/mail/$oldfile.rpmorig
>-     fi
>+  if [ -f /etc/mail/$oldfile ] ; then
>+    cat /etc/mail/$oldfile | \
>+      awk "BEGIN { print \"# Entries from obsoleted /etc/mail/$oldfile\" ;} \
>+                 { print \$1\" RELAY\" }" >> /etc/mail/access
>+    cp /etc/mail/$oldfile /etc/mail/$oldfile.rpmorig
>+  fi
> done
> 
> #
>@@ -448,9 +453,9 @@
> #
> cf=`/bin/mktemp /etc/mail/sendmail.cf.XXXXXX`
> if [ "$cf" != "" ] ; then
>-	sed 's/^O AutoRebuildAliases$/#&/g' /etc/mail/sendmail.cf > ${cf} && \
>-	cat ${cf} > /etc/mail/sendmail.cf
>-	rm ${cf}
>+  sed 's/^O AutoRebuildAliases$/#&/g' /etc/mail/sendmail.cf > ${cf} && \
>+    cat ${cf} > /etc/mail/sendmail.cf
>+  rm ${cf}
> fi
> 
> /sbin/chkconfig --add sendmail
>@@ -458,47 +463,53 @@
> # 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 /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/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 \
>-	--initscript sendmail
>+  --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 /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/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 \
>+  --initscript sendmail
> 
> 
> #
> # Oops, these files moved
> #
> if [ -f /etc/sendmail.cw ]; then
>-    cat /etc/sendmail.cw  | \
>-      awk 'BEGIN { print "# Entries from obsoleted /etc/sendmail.cw" ;} \
>-           { print $1 }' >> /etc/mail/local-host-names
>-    cp /etc/sendmail.cw /etc/sendmail.cw.rpmorig
>+  cat /etc/sendmail.cw  | \
>+    awk 'BEGIN { print "# Entries from obsoleted /etc/sendmail.cw" ;} \
>+               { print $1 }' >> /etc/mail/local-host-names
>+  cp /etc/sendmail.cw /etc/sendmail.cw.rpmorig
> fi
> #
> # Rebuild maps (next reboot will rebuild also)
> #
> {
>-  chown root /etc/aliases.db /etc/mail/access.db /etc/mail/mailertable.db \
>-    /etc/mail/domaintable.db  /etc/mail/virtusertable.db
>+  [ -f /etc/aliases.db ] && chown root /etc/aliases.db
>   /usr/bin/newaliases
>+  # Build maps using Makefile if possible in case user has modified the Makefile
>   for map in virtusertable access domaintable mailertable ; do
>     if [ -f /etc/mail/${map} ]; then
>-      /usr/bin/makemap hash /etc/mail/${map} < /etc/mail/${map}
>+      if [ -x /usr/bin/make ]; then
>+        rm -f /etc/mail/${map}.db
>+        make -C /etc/mail /etc/mail/${map}.db
>+      else 
>+        /usr/bin/makemap hash /etc/mail/${map} < /etc/mail/${map} 
>+      fi
>+      chown root /etc/mail/${map}.db
>     fi
>   done
> } > /dev/null 2>&1
>-
>+exit 0
> 
> %preun
> if [ $1 = 0 ]; then
>-	%{initdir}/sendmail stop >/dev/null 2>&1
>-	/sbin/chkconfig --del sendmail
>-	/usr/sbin/alternatives --remove mta %{_sbindir}/sendmail.sendmail
>+  %{initdir}/sendmail stop >/dev/null 2>&1
>+  /sbin/chkconfig --del sendmail
>+  /usr/sbin/alternatives --remove mta %{_sbindir}/sendmail.sendmail
> fi
> exit 0
> 
>@@ -510,75 +521,81 @@
> 
> %files
> %defattr(-,root,root)
>-/usr/bin/hoststat
>-/usr/bin/makemap
>-/usr/bin/purgestat
>-/usr/sbin/mailstats
>-/usr/sbin/makemap
>-/usr/sbin/praliases
>-%attr(2755,root,smmsp)/usr/sbin/sendmail.sendmail
>-/usr/bin/rmail.sendmail
>-/usr/bin/newaliases.sendmail
>-/usr/bin/mailq.sendmail
>-/usr/sbin/smrsh
>+%doc LICENSE FAQ KNOWNBUGS README RELEASE_NOTES
>+%{_bindir}/hoststat
>+%{_bindir}/mailq.sendmail
>+%{_bindir}/makemap
>+%{_bindir}/newaliases.sendmail
>+%{_bindir}/purgestat
>+%{_bindir}/rmail.sendmail
>+%{_sbindir}/mailstats
>+%{_sbindir}/makemap
>+%{_sbindir}/praliases
>+%attr(2755,root,smmsp) %{_sbindir}/sendmail.sendmail
>+%{_sbindir}/smrsh
> /usr/lib/sendmail.sendmail
> 
>-%{_mandir}/man8/rmail.8*
>-%{_mandir}/man8/praliases.8*
>-%{_mandir}/man8/mailstats.8*
>-%{_mandir}/man8/makemap.8*
>-%{_mandir}/man8/sendmail.sendmail.8*
>-%{_mandir}/man8/smrsh.8*
>-%{_mandir}/man5/aliases.sendmail.5*
>-%{_mandir}/man1/newaliases.sendmail.1*
>-%{_mandir}/man1/mailq.sendmail.1*
>-
>-%dir %{stdir}
>-%config(noreplace)		%{stdir}/statistics
>-%config(noreplace)		/etc/mail/sendmail.cf
>-%config(noreplace)		/etc/mail/submit.cf
>-%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
>+%{_mandir}/man8/rmail.8.gz
>+%{_mandir}/man8/praliases.8.gz
>+%{_mandir}/man8/mailstats.8.gz
>+%{_mandir}/man8/makemap.8.gz
>+%{_mandir}/man8/sendmail.sendmail.8.gz
>+%{_mandir}/man8/smrsh.8.gz
>+%{_mandir}/man5/aliases.sendmail.5.gz
>+%{_mandir}/man1/newaliases.sendmail.1.gz
>+%{_mandir}/man1/mailq.sendmail.1.gz
>+
>+%dir                            %{stdir}/
>+%config(noreplace)              %{stdir}/statistics
>+%dir                            /etc/smrsh/
>+%dir                            /etc/mail/
>+%config(noreplace)              /etc/mail/sendmail.cf
>+%config(noreplace)              /etc/mail/submit.cf
>+%config(noreplace)              /etc/mail/sendmail.mc
>+%config(noreplace)              /etc/mail/submit.mc
>+%config(noreplace)              /etc/mail/local-host-names
> %if "%{old_setup}" == "yes"
>-%config(noreplace)		/etc/aliases
>+%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
>-%dir /etc/smrsh
>-%dir /etc/mail
>-
>-%config(noreplace) /etc/mail/Makefile
>-%attr(0644,root,root) %ghost			/etc/mail/virtusertable.db
>-%attr(0644,root,root) %config(noreplace)	/etc/mail/virtusertable
>-
>-%attr(0644,root,root) %ghost			/etc/mail/access.db
>-%attr(0644,root,root) %config(noreplace)	/etc/mail/access
>-
>-%attr(0644,root,root) %ghost			/etc/mail/domaintable.db
>-%attr(0644,root,root) %config(noreplace)	/etc/mail/domaintable
>-
>-%attr(0644,root,root) %ghost			/etc/mail/mailertable.db
>-%attr(0644,root,root) %config(noreplace)	/etc/mail/mailertable
>-
>-%attr(0644,root,root) %config(noreplace)	/etc/mail/helpfile
>-%attr(0644,root,root) %config(noreplace)	/etc/mail/trusted-users
>-
>-%config(noreplace) /etc/sysconfig/sendmail
>-
>-%config %{initdir}/sendmail
>+%ghost                          /etc/aliases.db
>+%config(noreplace)              /etc/mail/Makefile
>+%ghost                          /etc/mail/access.db
>+%config(noreplace)              /etc/mail/access
>+%ghost                          /etc/mail/domaintable.db
>+%config(noreplace)              /etc/mail/domaintable
>+%ghost                          /etc/mail/mailertable.db
>+%config(noreplace)              /etc/mail/mailertable
>+%ghost                          /etc/mail/virtusertable.db
>+%config(noreplace)              /etc/mail/virtusertable
>+%config(noreplace)              /etc/mail/helpfile
>+%config(noreplace)              /etc/mail/trusted-users
>+                                %{initdir}/sendmail
>+%config(noreplace)              /etc/pam.d/smtp.sendmail
>+%config(noreplace)              /etc/sysconfig/sendmail
>+%config                         %{_libdir}/sasl*/Sendmail*.conf
> 
>-%config %{_libdir}/sasl*/Sendmail*.conf
>-%config(noreplace) /etc/pam.d/smtp.sendmail
>+%attr(0770,smmsp,smmsp) %dir    /var/spool/clientmqueue/
>+%attr(0700,root,mail)   %dir    /var/spool/mqueue/
> 
> %files cf
> %defattr(-,root,root)
>-%{sendmailcf}
>+%dir %{sendmailcf}/
>+%doc %{sendmailcf}/README
>+%{sendmailcf}/cf/
>+%{sendmailcf}/domain/
>+%{sendmailcf}/feature/
>+%{sendmailcf}/hack/
>+%{sendmailcf}/m4/
>+%{sendmailcf}/mailer/
>+%{sendmailcf}/ostype/
>+%{sendmailcf}/sendmail.schema
>+%{sendmailcf}/sh/
>+%{sendmailcf}/siteconfig/
> 
> %files devel
> %defattr(-,root,root)
>-%dir %{_includedir}/libmilter
>+%doc libmilter/docs/*
>+%dir %{_includedir}/libmilter/
> %{_includedir}/libmilter/*.h
> %{_libdir}/libmilter.a
> %{_libdir}/libsmutil.a
>@@ -938,11 +955,11 @@
> * Mon Dec 02 2002 Florian La Roche <Florian.LaRoche@redhat.de>
> - add the following changes from Adrian Havill <havill@redhat.com>
>   to our default sendmail.mc file:
>-	- added commented-out-by-default common AUTH/SSL examples
>-	- updated m4 example and rpm reference
>-	- added more comment documentation
>-	- add commented out confAUTO_REBUILD example
>-	- improve description about MASQUERADE_AS
>+  - added commented-out-by-default common AUTH/SSL examples
>+  - updated m4 example and rpm reference
>+  - added more comment documentation
>+  - add commented out confAUTO_REBUILD example
>+  - improve description about MASQUERADE_AS
> 
> * Mon Nov 18 2002 Florian La Roche <Florian.LaRoche@redhat.de>
> - add to submit.mc: define(`_MTA_HOST_', `[127.0.0.1]')
>@@ -984,9 +1001,9 @@
> 
> * Wed Jul 24 2002 Florian La Roche <Florian.LaRoche@redhat.de>
> - suggestions form Stephane Lentz:
>-	- add correct include statement into submit.mc (like sendmail.mc)
>-	- add commented out further suggestions into submit.mc
>-	- disable ident lookups
>+  - add correct include statement into submit.mc (like sendmail.mc)
>+  - add commented out further suggestions into submit.mc
>+  - disable ident lookups
> 
> * Thu Jul 11 2002 Florian La Roche <Florian.LaRoche@redhat.de>
> - fix initscript for the second daemon and pidfile location #67910
>@@ -1041,7 +1058,7 @@
> - run chkconfig --add before alternatives
> 
> * Thu Feb 28 2002 Bill Nottingham <notting@redhat.com> 8.12.2-3
>-- run alternatives --remove in %preun
>+- run alternatives --remove in %%preun
> - add some prereqs
> 
> * Mon Feb 25 2002 Nalin Dahyabhai <nalin@redhat.com> 8.12.2-2
>@@ -1062,7 +1079,7 @@
>   to build this for older releases
> 
> * Fri Feb  1 2002 Bill Nottingham <notting@redhat.com> 8.11.6-12
>-- %triggerpostun on older versions to make sure alternatives work on
>+- %%triggerpostun on older versions to make sure alternatives work on
>   upgrades
> 
> * Thu Jan 31 2002 Bill Nottingham <notting@redhat.com> 8.11.6-11
>@@ -1136,9 +1153,9 @@
> - add "localhost.localdomain" to the list of hostnames accepted
>   for local delivery "Cw" in /etc/mail/sendmail.mc
> - add patches from Pekka Savola <pekkas@netcore.fi>
>-	- Enable IPv6 at compile time, patch for glibc 2.2 from PLD
>-	- Add a commented-out IPv6 daemon .mc line to sendmail.mc
>-	- buildrequire: openldap-devel, cyrus-sasl-devel
>+  - Enable IPv6 at compile time, patch for glibc 2.2 from PLD
>+  - Add a commented-out IPv6 daemon .mc line to sendmail.mc
>+  - buildrequire: openldap-devel, cyrus-sasl-devel
> 
> * Fri Mar  2 2001 Nalin Dahyabhai <nalin@redhat.com>
> - rebuild in new environment
>@@ -1148,11 +1165,11 @@
> 
> * Wed Feb 21 2001 Florian La Roche <Florian.LaRoche@redhat.de>
> - add changes from Christopher McCrory <chrismcc@pricegrabber.com>:
>-	- prepare /etc/mail/Makefile for more maps not shipped with this rpm
>-	- changed sendmail.mc to include some more commented out options,
>-	  so that people are directly pointed at important options
>-	- add /etc/pam.d/smtp for AUTH
>-	- add FEATURE(use_ct_file) and /etc/mail/trusted-users
>+  - prepare /etc/mail/Makefile for more maps not shipped with this rpm
>+  - changed sendmail.mc to include some more commented out options,
>+    so that people are directly pointed at important options
>+  - add /etc/pam.d/smtp for AUTH
>+  - add FEATURE(use_ct_file) and /etc/mail/trusted-users
> 
> * Fri Feb 16 2001 Tim Powers <timp@redhat.com>
> - don't obsolete postfix and exim, only conflict (for RHN purposes)
>@@ -1340,7 +1357,7 @@
> 
> * Mon Mar 22 1999 Jeff Johnson <jbj@redhat.com>
> - correxct dangling symlinks.
>-- check for map file existence in %post.
>+- check for map file existence in %%post.
> 
> * Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
> - auto rebuild in the new build environment (release 3)
>--- /dev/null	2007-02-19 08:30:52.568970056 +0000
>+++ sendmail-etc-aliases	2004-10-08 16:37:48.000000000 +0100
>@@ -0,0 +1,100 @@
>+#
>+#  Aliases in this file will NOT be expanded in the header from
>+#  Mail, but WILL be visible over networks or from /bin/mail.
>+#
>+#	>>>>>>>>>>	The program "newaliases" must be run after
>+#	>> NOTE >>	this file is updated for any changes to
>+#	>>>>>>>>>>	show through to sendmail.
>+#
>+
>+# Basic system aliases -- these MUST be present.
>+mailer-daemon:	postmaster
>+postmaster:	root
>+
>+# General redirections for pseudo accounts.
>+bin:		root
>+daemon:		root
>+adm:		root
>+lp:		root
>+sync:		root
>+shutdown:	root
>+halt:		root
>+mail:		root
>+news:		root
>+uucp:		root
>+operator:	root
>+games:		root
>+gopher:		root
>+ftp:		root
>+nobody:		root
>+radiusd:	root
>+nut:		root
>+dbus:		root
>+vcsa:		root
>+canna:		root
>+wnn:		root
>+rpm:		root
>+nscd:		root
>+pcap:		root
>+apache:		root
>+webalizer:	root
>+dovecot:	root
>+fax:		root
>+quagga:		root
>+radvd:		root
>+pvm:		root
>+amanda:		root
>+privoxy:	root
>+ident:		root
>+named:		root
>+xfs:		root
>+gdm:		root
>+mailnull:	root
>+postgres:	root
>+sshd:		root
>+smmsp:		root
>+postfix:	root
>+netdump:	root
>+ldap:		root
>+squid:		root
>+ntp:		root
>+mysql:		root
>+desktop:	root
>+rpcuser:	root
>+rpc:		root
>+nfsnobody:	root
>+
>+ingres:		root
>+system:		root
>+toor:		root
>+manager:	root
>+dumper:		root
>+abuse:		root
>+
>+# mailman aliases
>+mailman:	postmaster
>+mailman-owner:	mailman
>+
>+newsadm:	news
>+newsadmin:	news
>+usenet:		news
>+ftpadm:		ftp
>+ftpadmin:	ftp
>+ftp-adm:	ftp
>+ftp-admin:	ftp
>+www:		webmaster
>+webmaster:	root
>+noc:		root
>+security:	root
>+hostmaster:	root
>+info:		postmaster
>+marketing:	postmaster
>+sales:		postmaster
>+support:	postmaster
>+
>+
>+# trap decode to catch security attacks
>+decode:		root
>+
>+# Person who should get root's mail
>+#root:		marc
>--- sendmail.etc-mail-Makefile	2006-07-20 11:03:59.000000000 +0100
>+++ /dev/null	2007-02-19 08:30:52.568970056 +0000
>@@ -1,41 +0,0 @@
>-# These could be used by sendmail, but are not part of the default install.
>-# To use them you will have to generate your own sendmail.cf with
>-#  FEATURE('whatever')
>-#
>-POSSIBLE += $(shell test -f bitdomain     && echo bitdomain.db)
>-POSSIBLE += $(shell test -f uudomain      && echo uudomain.db)
>-POSSIBLE += $(shell test -f genericstable && echo genericstable.db)
>-POSSIBLE += $(shell test -f userdb	  && echo userdb.db)
>-POSSIBLE += $(shell test -f authinfo      && echo authinfo.db)
>-CFFILES   = sendmail.cf submit.cf
>-
>-
>-all: ${CFFILES} ${POSSIBLE} virtusertable.db access.db domaintable.db mailertable.db
>-
>-userdb.db: userdb
>-	@makemap btree $@ < $<
>-
>-%.db: %
>-	@makemap hash $@ < $<
>-
>-%.cf: %.mc
>-	@if test -f /usr/share/sendmail-cf/m4/cf.m4; then \
>-		umask 022; \
>-		[ -e $@ ] && mv -f $@ $@.bak; \
>-		m4 $< > $@; \
>-	else \
>-		echo -e "WARNING: '$<' is modified. Please install package sendmail-cf to update your configuration."; \
>-	fi
>-
>-clean:
>-	rm -f *.db *~
>-
>-start:
>-	service sendmail start
>-
>-stop:
>-	service sendmail stop
>-
>-restart:
>-	service sendmail restart
>-
>--- /dev/null	2007-02-19 08:30:52.568970056 +0000
>+++ sendmail-etc-mail-Makefile	2006-07-20 11:03:59.000000000 +0100
>@@ -0,0 +1,41 @@
>+# These could be used by sendmail, but are not part of the default install.
>+# To use them you will have to generate your own sendmail.cf with
>+#  FEATURE('whatever')
>+#
>+POSSIBLE += $(shell test -f bitdomain     && echo bitdomain.db)
>+POSSIBLE += $(shell test -f uudomain      && echo uudomain.db)
>+POSSIBLE += $(shell test -f genericstable && echo genericstable.db)
>+POSSIBLE += $(shell test -f userdb	  && echo userdb.db)
>+POSSIBLE += $(shell test -f authinfo      && echo authinfo.db)
>+CFFILES   = sendmail.cf submit.cf
>+
>+
>+all: ${CFFILES} ${POSSIBLE} virtusertable.db access.db domaintable.db mailertable.db
>+
>+userdb.db: userdb
>+	@makemap btree $@ < $<
>+
>+%.db: %
>+	@makemap hash $@ < $<
>+
>+%.cf: %.mc
>+	@if test -f /usr/share/sendmail-cf/m4/cf.m4; then \
>+		umask 022; \
>+		[ -e $@ ] && mv -f $@ $@.bak; \
>+		m4 $< > $@; \
>+	else \
>+		echo -e "WARNING: '$<' is modified. Please install package sendmail-cf to update your configuration."; \
>+	fi
>+
>+clean:
>+	rm -f *.db *~
>+
>+start:
>+	service sendmail start
>+
>+stop:
>+	service sendmail stop
>+
>+restart:
>+	service sendmail restart
>+
>--- /dev/null	2007-02-19 08:30:52.568970056 +0000
>+++ sendmail-etc-mail-access	2007-02-15 17:47:16.000000000 +0000
>@@ -0,0 +1,10 @@
>+# Check the /usr/share/doc/sendmail/README.cf file for a description
>+# of the format of this file. (search for access_db in that file)
>+# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
>+# package.
>+#
>+# by default we allow relaying from localhost...
>+Connect:localhost.localdomain		RELAY
>+Connect:localhost			RELAY
>+Connect:127.0.0.1			RELAY
>+
>--- /dev/null	2007-02-19 08:30:52.568970056 +0000
>+++ sendmail-etc-mail-domaintable	2007-02-19 17:14:03.000000000 +0000
>@@ -0,0 +1,4 @@
>+# The "domain table" can be used to provide domain name mapping.
>+# Use of this should really be limited to your own domains.
>+# It may be useful if you change names (e.g., your company
>+# changes names from oldname.com to newname.com)
>--- /dev/null	2007-02-19 08:30:52.568970056 +0000
>+++ sendmail-etc-mail-local-host-names	2007-02-19 17:06:20.000000000 +0000
>@@ -0,0 +1 @@
>+# local-host-names - include all aliases for your machine here.
>--- /dev/null	2007-02-19 08:30:52.568970056 +0000
>+++ sendmail-etc-mail-mailertable	2007-02-19 17:18:24.000000000 +0000
>@@ -0,0 +1,28 @@
>+# The "mailer table" can be used to override routing for particular
>+# non-local domains
>+#
>+# Keys in this database are fully qualified domain names or partial domains
>+# preceded by a dot -- for example, "vangogh.CS.Berkeley.EDU" or
>+# ".CS.Berkeley.EDU".  As a special case of the latter, "." matches any domain
>+# not covered by other keys.  Values must be of the form:
>+#
>+# mailer:domain
>+#
>+# where "mailer" is the internal mailer name, and "domain" is where to send
>+# the message.  These maps are not reflected into the message header.  As a
>+# special case, the forms:
>+#
>+# local:user
>+#
>+# will forward to the indicated user using the local mailer,
>+#
>+# local:
>+#
>+# will forward to the original user in the e-mail address using the local
>+# mailer, and
>+#
>+# error:code message
>+# error:D.S.N:code message
>+#
>+# will give an error message with the indicated SMTP reply code and message,
>+# where D.S.N is an RFC 1893 compliant error code.
>--- /dev/null	2007-02-19 08:30:52.568970056 +0000
>+++ sendmail-etc-mail-trusted-users	2007-02-19 17:06:58.000000000 +0000
>@@ -0,0 +1,2 @@
>+# trusted-users - users that can send mail as others without a warning
>+# apache, mailman, majordomo, uucp, are good candidates
>--- /dev/null	2007-02-19 08:30:52.568970056 +0000
>+++ sendmail-etc-mail-virtusertable	2007-02-19 17:09:52.000000000 +0000
>@@ -0,0 +1,8 @@
>+# domain-specific aliases
>+#
>+# e.g.
>+# info@foo.com	foo-info
>+# info@bar.com	bar-info
>+# joe@bar.com	error:nouser 550 No such user here
>+# jax@bar.com	error:5.7.0:550 Address invalid
>+# @baz.org	jane@example.net

Actions: View | Diff

Attachments on bug 226407: 148135 | 148408 | 157873 | 423270