From 90a31a9b355380844115a3c979261b202e3e1757 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@fedoraproject.org>
Date: Jun 11 2010 14:22:33 +0000
Subject: - silenced warning about non-existing config in {_libdir}/sasl2


---

diff --git a/sendmail-8.14.4-sasl2-in-etc.patch b/sendmail-8.14.4-sasl2-in-etc.patch
new file mode 100644
index 0000000..c7f1a6f
--- /dev/null
+++ b/sendmail-8.14.4-sasl2-in-etc.patch
@@ -0,0 +1,29 @@
+--- sendmail-8.14.4/sendmail/usersmtp.c	2009-06-17 18:26:51.000000000 +0100
++++ sendmail-8.14.4/sendmail/usersmtp.c	2010-06-11 13:13:52.150312505 +0100
+@@ -1323,9 +1323,7 @@
+ {
+ 	long sff;
+ 	int r;
+-#if SASL <= 10515
+ 	size_t len;
+-#endif /* SASL <= 10515 */
+ 	char *p;
+ 
+ 	if (file == NULL || *file == '\0')
+@@ -1361,9 +1359,16 @@
+ #endif /* SASL <= 10515 */
+ 
+ 	p = (char *) file;
++	len = strlen(p);
+ 	if ((r = safefile(p, RunAsUid, RunAsGid, RunAsUserName, sff,
+ 			  S_IRUSR, NULL)) == 0)
+ 		return SASL_OK;
++#if SASL > 10515
++	/* Expect /usr/lib/sasl2/Sendmail.conf to be missing - config now in /etc/sasl2 */
++	if (type == SASL_VRFY_CONF && r == ENOENT &&
++            len >= 8 && strncmp(p, "/usr/lib", 8) == 0)
++		return SASL_CONTINUE;
++#endif /* SASL > 10515 */
+ 	if (LogLevel > (r != ENOENT ? 8 : 10))
+ 		sm_syslog(LOG_WARNING, NOQID, "error: safesasl(%s) failed: %s",
+ 			  p, sm_errstring(r));
diff --git a/sendmail.spec b/sendmail.spec
index f9c6bfa..804436a 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -14,7 +14,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -50,6 +50,7 @@ Patch18: sendmail-8.14.4-switchfile.patch
 Patch20: sendmail-8.14.3-milterfdleaks.patch
 Patch21: sendmail-8.14.3-ipv6-bad-helo.patch
 Patch22: sendmail-8.14.4-libdb5.patch
+Patch23: sendmail-8.14.4-sasl2-in-etc.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: libdb-devel
@@ -158,6 +159,7 @@ cp devtools/M4/UNIX/{,shared}library.m4
 %patch20 -p1 -b .milterfdleaks
 %patch21 -p1 -b .ipv6-bad-helo
 %patch22 -p1 -b .libdb5
+%patch23 -p1 -b .sasl2-in-etc
 
 for f in RELEASE_NOTES contrib/etrn.0; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -597,6 +599,9 @@ exit 0
 
 
 %changelog
+* Fri Jun 11 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-7
+- silenced warning about non-existing config in {_libdir}/sasl2
+
 * Tue Jun 08 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-6
 - sasl2 config moved from {_libdir}/sasl2 to {_sysconfdir}/sasl2
 - added libdb5 patch for building with libdb-5