From 61b0fa11e5bd3a5219f545ed4254108323a59f1b Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@fedoraproject.org>
Date: Feb 15 2010 13:03:34 +0000
Subject: - fixed libresolv implicit DSO linking (#564647)

- fixed initscript LSB compliance (#561040)

---

diff --git a/sendmail.init b/sendmail.init
index 54dafec..a98d9a7 100644
--- a/sendmail.init
+++ b/sendmail.init
@@ -36,10 +36,13 @@ fi
 [ -z "$SMQUEUE" ] && SMQUEUE="$QUEUE"
 [ -z "$SMQUEUE" ] && SMQUEUE=1h
 
+# Check that we're a privileged user
+[ `id -u` = 0 ] || exit 4
+
 # Check that networking is up.
 [ "${NETWORKING}" = "no" ] && exit 1
 
-[ -f /usr/sbin/sendmail ] || exit 5
+[ -x /usr/sbin/sendmail ] || exit 5
 
 prog="sendmail"
 
@@ -148,9 +151,9 @@ case "$1" in
 	RETVAL=$?
 	;;
     status)
-	echo -n sendmail; status -p /var/run/sendmail.pid
+	echo -n sendmail; status -p /var/run/sendmail.pid -l sendmail
 	RETVAL=$?
-	echo -n sm-client; status -p /var/run/sm-client.pid
+	echo -n sm-client; status -p /var/run/sm-client.pid -l sm-client
 	[ $RETVAL -eq 0 ] && RETVAL=$?
 	;;
     *)
diff --git a/sendmail.spec b/sendmail.spec
index 7341c5f..9d5d557 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: 2%{?dist}
+Release: 3%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -174,7 +174,7 @@ define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP -DNAMED_B
 define(\`confOPTIMIZE', \`\`\`\`${RPM_OPT_FLAGS}'''')
 define(\`confENVDEF', \`-I%{_includedir}/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(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb -lresolv')
 define(\`confMANOWN', \`root')
 define(\`confMANGRP', \`root')
 define(\`confMANMODE', \`644')
@@ -562,6 +562,10 @@ exit 0
 
 
 %changelog
+* Mon Feb 15 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-3
+- fixed libresolv implicit DSO linking (#564647)
+- fixed initscript LSB compliance (#561040)
+
 * Thu Feb 04 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-2
 - fixed typo in spec file
 - fixed aliases_dir patch