rpms/sendmail
5
0
Fork 0
Code Issues Pull Requests Releases Activity

[tw]

Browse Source 
- fixed selinuxenabled path in initscript
- fixed error handling with sigwait (#137709) Thanks to Jonathan Kamens for
    the patch
- fixed prereq for cyrus-sasl: now using /usr/sbin/saslauthd
- appended 'dnl' to cert tags in sendmail.mc
This commit is contained in:
Thomas Woerner 2006-02-17 16:57:15 +00:00
parent 624996d371
commit 36b7a280bf
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sendmail-redhat.mc
View File

@ -53,10 +53,10 @@ dnl # cd /usr/share/ssl/certs; make sendmail.pem
dnl # Complete usage: dnl # Complete usage:
dnl # make -C /usr/share/ssl/certs usage dnl # make -C /usr/share/ssl/certs usage
dnl # dnl #
dnl define(`confCACERT_PATH',`/etc/pki/tls/certs') dnl define(`confCACERT_PATH',`/etc/pki/tls/certs')dnl
dnl define(`confCACERT',`/etc/pki/tls/certs/ca-bundle.crt') dnl define(`confCACERT',`/etc/pki/tls/certs/ca-bundle.crt')dnl
dnl define(`confSERVER_CERT',`/etc/pki/tls/certs/sendmail.pem') dnl define(`confSERVER_CERT',`/etc/pki/tls/certs/sendmail.pem')dnl
dnl define(`confSERVER_KEY',`/etc/pki/tls/certs/sendmail.pem') dnl define(`confSERVER_KEY',`/etc/pki/tls/certs/sendmail.pem')dnl
dnl # dnl #
dnl # This allows sendmail to use a keyfile that is shared with OpenLDAP's 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 # slapd, which requires the file to be readble by group ldap

2
sendmail.init
View File

@ -58,7 +58,7 @@ start() {
echo -n $"Starting sm-client: " echo -n $"Starting sm-client: "
touch /var/run/sm-client.pid touch /var/run/sm-client.pid
chown smmsp:smmsp /var/run/sm-client.pid chown smmsp:smmsp /var/run/sm-client.pid
if [ -x /usr/bin/selinuxenabled ] && /usr/bin/selinuxenabled; then if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
/sbin/restorecon /var/run/sm-client.pid /sbin/restorecon /var/run/sm-client.pid
fi fi
daemon --check sm-client /usr/sbin/sendmail -L sm-msp-queue -Ac \ daemon --check sm-client /usr/sbin/sendmail -L sm-msp-queue -Ac \

18
sendmail.spec
View File

@ -18,7 +18,7 @@
Summary: A widely used Mail Transport Agent (MTA). Summary: A widely used Mail Transport Agent (MTA).
Name: sendmail Name: sendmail
Version: 8.13.5 Version: 8.13.5
Release: 2.2.1 Release: 3
License: Sendmail License: Sendmail
Group: System Environment/Daemons Group: System Environment/Daemons
Provides: smtpdaemon Provides: smtpdaemon
@ -42,6 +42,7 @@ Patch9: sendmail-8.12.7-hesiod.patch
Patch10: sendmail-8.12.7-manpage.patch Patch10: sendmail-8.12.7-manpage.patch
Patch11: sendmail-8.13.4-dynamic.patch Patch11: sendmail-8.13.4-dynamic.patch
Patch12: sendmail-8.13.0-cyrus.patch Patch12: sendmail-8.13.0-cyrus.patch
Patch13: sendmail-8.13.4-libmilter-sigwait.patch
Buildroot: %{_tmppath}/%{name}-root Buildroot: %{_tmppath}/%{name}-root
BuildRequires: tcp_wrappers BuildRequires: tcp_wrappers
BuildRequires: db4-devel BuildRequires: db4-devel
@ -70,7 +71,7 @@ PreReq: openssl
%endif %endif
%if "%{with_sasl1}" == "yes" || "%{with_sasl2}" == "yes" %if "%{with_sasl1}" == "yes" || "%{with_sasl2}" == "yes"
BuildRequires: cyrus-sasl-devel, openssl-devel BuildRequires: cyrus-sasl-devel, openssl-devel
PreReq: cyrus-sasl, openssl PreReq: /usr/sbin/saslauthd, openssl
%endif %endif
%if "%{with_ldap}" == "yes" %if "%{with_ldap}" == "yes"
BuildRequires: openldap-devel, openssl-devel BuildRequires: openldap-devel, openssl-devel
@ -136,6 +137,7 @@ your sendmail.cf file.
%patch10 -p1 -b .manpage %patch10 -p1 -b .manpage
%patch11 -p1 -b .dynamic %patch11 -p1 -b .dynamic
%patch12 -p1 -b .cyrus %patch12 -p1 -b .cyrus
%patch13 -p0 -b .libmilter-sigwait
%build %build
# generate redhat config file # generate redhat config file
@ -156,6 +158,11 @@ define(\`STATUS_FILE', \`%{stdir}/statistics')
define(\`confLIBSEARCH', \`db resolv 44bsd') define(\`confLIBSEARCH', \`db resolv 44bsd')
EOF EOF
# block mail from http proxies
#cat >> redhat.config.m4 << EOF
#APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_BLOCK_PROXIES')
#EOF
%ifarch ppc ppc64 s390x %ifarch ppc ppc64 s390x
cat >> redhat.config.m4 << EOF cat >> redhat.config.m4 << EOF
APPENDDEF(\`confOPTIMIZE', \`-DSM_CONF_SHM=0') APPENDDEF(\`confOPTIMIZE', \`-DSM_CONF_SHM=0')
@ -572,6 +579,13 @@ exit 0
%{_docdir}/sendmail %{_docdir}/sendmail
%changelog %changelog
* Fri Feb 17 2006 Thomas Woerner <twoerner@redhat.com> 8.13.5-3
- fixed selinuxenabled path in initscript
- fixed error handling with sigwait (#137709)
Thanks to Jonathan Kamens for the patch
- fixed prereq for cyrus-sasl: now using /usr/sbin/saslauthd
- appended 'dnl' to cert tags in sendmail.mc
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 8.13.5-2.2.1 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 8.13.5-2.2.1
- bump again for double-long bug on ppc(64) - bump again for double-long bug on ppc(64)