From 36b7a280bf41e4ed348189d366d90fd51377ea32 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@fedoraproject.org>
Date: Feb 17 2006 16:57:15 +0000
Subject: [tw]

- 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

---

diff --git a/sendmail-redhat.mc b/sendmail-redhat.mc
index 734e769..a04147e 100644
--- a/sendmail-redhat.mc
+++ b/sendmail-redhat.mc
@@ -53,10 +53,10 @@ 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 define(`confCACERT',`/etc/pki/tls/certs/ca-bundle.crt')
-dnl define(`confSERVER_CERT',`/etc/pki/tls/certs/sendmail.pem')
-dnl define(`confSERVER_KEY',`/etc/pki/tls/certs/sendmail.pem')
+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
diff --git a/sendmail.init b/sendmail.init
index fab8221..55eaf25 100644
--- a/sendmail.init
+++ b/sendmail.init
@@ -58,7 +58,7 @@ start() {
 	echo -n $"Starting sm-client: "
 	touch /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
 	fi
 	daemon --check sm-client /usr/sbin/sendmail -L sm-msp-queue -Ac \
diff --git a/sendmail.spec b/sendmail.spec
index a25a233..c5bc108 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -18,7 +18,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
 Version: 8.13.5
-Release: 2.2.1
+Release: 3
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -42,6 +42,7 @@ Patch9: sendmail-8.12.7-hesiod.patch
 Patch10: sendmail-8.12.7-manpage.patch
 Patch11: sendmail-8.13.4-dynamic.patch
 Patch12: sendmail-8.13.0-cyrus.patch
+Patch13: sendmail-8.13.4-libmilter-sigwait.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: tcp_wrappers
 BuildRequires: db4-devel
@@ -70,7 +71,7 @@ PreReq:       openssl
 %endif
 %if "%{with_sasl1}" == "yes" || "%{with_sasl2}" == "yes"
 BuildRequires:  cyrus-sasl-devel, openssl-devel
-PreReq:       cyrus-sasl, openssl
+PreReq:       /usr/sbin/saslauthd, openssl
 %endif
 %if "%{with_ldap}" == "yes"
 BuildRequires:  openldap-devel, openssl-devel
@@ -136,6 +137,7 @@ your sendmail.cf file.
 %patch10 -p1 -b .manpage
 %patch11 -p1 -b .dynamic
 %patch12 -p1 -b .cyrus
+%patch13 -p0 -b .libmilter-sigwait
 
 %build
 # generate redhat config file
@@ -156,6 +158,11 @@ define(\`STATUS_FILE', \`%{stdir}/statistics')
 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')
@@ -572,6 +579,13 @@ exit 0
 %{_docdir}/sendmail
 
 %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
 - bump again for double-long bug on ppc(64)