diff --git a/sendmail-redhat.mc b/sendmail-redhat.mc index 96f7ad6..5db4da4 100644 --- a/sendmail-redhat.mc +++ b/sendmail-redhat.mc @@ -11,6 +11,10 @@ include(`@@PATH@@/m4/cf.m4')dnl VERSIONID(`setup for linux')dnl OSTYPE(`linux')dnl dnl # +dnl # Do not advertize sendmail version. +dnl # +dnl define(`confSMTP_LOGIN_MSG', `$j Sendmail; $b')dnl +dnl # dnl # default logging level is 9, you might want to set it higher to dnl # debug the configuration dnl # @@ -19,14 +23,14 @@ dnl # dnl # Uncomment and edit the following line if your outgoing mail needs to dnl # be sent out through an external mail server: dnl # -dnl define(`SMART_HOST',`smtp.your.provider')dnl +dnl define(`SMART_HOST', `smtp.your.provider')dnl dnl # -define(`confDEF_USER_ID',``8:12'')dnl +define(`confDEF_USER_ID', ``8:12'')dnl dnl define(`confAUTO_REBUILD')dnl define(`confTO_CONNECT', `1m')dnl -define(`confTRY_NULL_MX_LIST',true)dnl -define(`confDONT_PROBE_INTERFACES',true)dnl -define(`PROCMAIL_MAILER_PATH',`/usr/bin/procmail')dnl +define(`confTRY_NULL_MX_LIST', `True')dnl +define(`confDONT_PROBE_INTERFACES', `True')dnl +define(`PROCMAIL_MAILER_PATH', `/usr/bin/procmail')dnl define(`ALIAS_FILE', `/etc/aliases')dnl define(`STATUS_FILE', `/var/log/mail/statistics')dnl define(`UUCP_MAILER_MAX', `2000000')dnl @@ -53,15 +57,15 @@ dnl # cd /usr/share/ssl/certs; make sendmail.pem dnl # Complete usage: dnl # make -C /usr/share/ssl/certs usage dnl # -dnl define(`confCACERT_PATH',`/etc/pki/tls/certs')dnl -dnl define(`confCACERT',`/etc/pki/tls/certs/ca-bundle.crt')dnl -dnl define(`confSERVER_CERT',`/etc/pki/tls/certs/sendmail.pem')dnl -dnl define(`confSERVER_KEY',`/etc/pki/tls/certs/sendmail.pem')dnl +dnl define(`confCACERT_PATH', `/etc/pki/tls/certs')dnl +dnl define(`confCACERT', `/etc/pki/tls/certs/ca-bundle.crt')dnl +dnl define(`confSERVER_CERT', `/etc/pki/tls/certs/sendmail.pem')dnl +dnl define(`confSERVER_KEY', `/etc/pki/tls/certs/sendmail.pem')dnl dnl # dnl # This allows sendmail to use a keyfile that is shared with OpenLDAP's dnl # slapd, which requires the file to be readble by group ldap dnl # -dnl define(`confDONT_BLAME_SENDMAIL',`groupreadablekeyfile')dnl +dnl define(`confDONT_BLAME_SENDMAIL', `groupreadablekeyfile')dnl dnl # dnl define(`confTO_QUEUEWARN', `4h')dnl dnl define(`confTO_QUEUERETURN', `5d')dnl @@ -69,32 +73,32 @@ dnl define(`confQUEUE_LA', `12')dnl dnl define(`confREFUSE_LA', `18')dnl define(`confTO_IDENT', `0')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 +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 FEATURE(redirect)dnl FEATURE(always_add_domain)dnl FEATURE(use_cw_file)dnl FEATURE(use_ct_file)dnl dnl # dnl # The following limits the number of processes sendmail can fork to accept -dnl # incoming messages or process its message queues to 12.) sendmail refuses +dnl # incoming messages or process its message queues to 20.) sendmail refuses dnl # to accept connections once it has reached its quota of child processes. dnl # -dnl define(`confMAX_DAEMON_CHILDREN', 12)dnl +dnl define(`confMAX_DAEMON_CHILDREN', `20')dnl dnl # dnl # Limits the number of new connections per second. This caps the overhead dnl # incurred due to forking new sendmail processes. May be useful against dnl # DoS attacks or barrages of spam. (As mentioned below, a per-IP address dnl # limit would be useful but is not available as an option at this writing.) dnl # -dnl define(`confCONNECTION_RATE_THROTTLE', 3)dnl +dnl define(`confCONNECTION_RATE_THROTTLE', `3')dnl 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 -o /etc/mail/access.db')dnl +FEATURE(local_procmail, `', `procmail -t -Y -a $h -d $u')dnl +FEATURE(`access_db', `hash -T -o /etc/mail/access.db')dnl FEATURE(`blacklist_recipients')dnl EXPOSED_USER(`root')dnl dnl # diff --git a/sendmail.spec b/sendmail.spec index 459db6e..9015002 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -18,7 +18,7 @@ Summary: A widely used Mail Transport Agent (MTA). Name: sendmail Version: 8.13.8 -Release: 1 +Release: 2 License: Sendmail Group: System Environment/Daemons Provides: smtpdaemon @@ -44,6 +44,7 @@ Patch11: sendmail-8.13.6-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 BuildRequires: tcp_wrappers BuildRequires: db4-devel @@ -141,6 +142,7 @@ your sendmail.cf file. %patch12 -p1 -b .cyrus %patch13 -p1 -b .aliases_dir %patch14 -p1 -b .vacation +%patch15 -p1 %build # generate redhat config file @@ -587,6 +589,10 @@ exit 0 %{_docdir}/sendmail %changelog +* Mon Sep 04 2006 Florian La Roche +- unify sendmail.mc +- remove version information from sendmail helpfile + * Fri Sep 1 2006 Thomas Woerner 8.13.8-1 - new version 8.13.8 fixes CVE-2006-4434 (denial of service via a long header line)