rpms/postfix/devel README-Postfix-SASL-RedHat.txt, 1.2, 1.3 postfix-etc-init.d-postfix, 1.10, 1.11 postfix.spec, 1.57, 1.58

[Thomas Woerner (twoerner)]

Author: twoerner

Update of /cvs/pkgs/rpms/postfix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8725

Modified Files:
	README-Postfix-SASL-RedHat.txt postfix-etc-init.d-postfix 
	postfix.spec 
Log Message:
- made init script lsb conform (#243286, rhbz#247025)
- added link to postfix sasl readme into Postfix-SASL-RedHat readme




Index: README-Postfix-SASL-RedHat.txt
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/README-Postfix-SASL-RedHat.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README-Postfix-SASL-RedHat.txt	9 Sep 2004 10:40:05 -0000	1.2
+++ README-Postfix-SASL-RedHat.txt	4 Oct 2007 13:39:00 -0000	1.3
@@ -458,6 +458,8 @@
 Other Sources of Documentation:
 -------------------------------
 
+/usr/share/doc/postfix-<version>/README_FILES/SASL_README
+
 Local configuration examples:
 
 /usr/share/doc/postfix-*/samples


Index: postfix-etc-init.d-postfix
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/postfix-etc-init.d-postfix,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- postfix-etc-init.d-postfix	14 Jun 2007 13:27:32 -0000	1.10
+++ postfix-etc-init.d-postfix	4 Oct 2007 13:39:00 -0000	1.11
@@ -16,23 +16,37 @@
 # 20/01/01: Changes to fall in line with RedHat 7.0 style
 # 23/02/01: Fix a few untidy problems with help from Daniel Roesen.
 
+### BEGIN INIT INFO
+# Provides: postfix MTA
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Short-Description: start and stop postfix
+# Description: Postfix is a Mail Transport Agent, which is the program that 
+#              moves mail from one machine to another.
+### END INIT INFO
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 
 # Source networking configuration.
 . /etc/sysconfig/network
 
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-[ -x /usr/sbin/postfix ] || exit 0
-[ -d /etc/postfix ] || exit 0
-[ -d /var/spool/postfix ] || exit 0
-
 RETVAL=0
 prog="postfix"
 
+status master >/dev/null 2>&1
+running=$?
+
+conf_check() {
+    [ -x /usr/sbin/postfix ] || exit 5
+    [ -d /etc/postfix ] || exit 6
+    [ -d /var/spool/postfix ] || exit 5
+}
+
 start() {
+	# Check that networking is up.
+	[ ${NETWORKING} = "no" ] && exit 1
+	conf_check
 	# Start daemons.
 	echo -n $"Starting postfix: "
         /usr/bin/newaliases >/dev/null 2>&1
@@ -44,6 +58,7 @@
 }
 
 stop() {
+	conf_check
         # Stop daemons.
 	echo -n $"Shutting down postfix: "
 	/usr/sbin/postfix stop 2>/dev/null 1>&2 && success || failure $"$prog stop"
@@ -54,6 +69,7 @@
 }
 
 reload() {
+	conf_check
 	echo -n $"Reloading postfix: "
 	/usr/sbin/postfix reload 2>/dev/null 1>&2 && success || failure $"$prog reload"
 	RETVAL=$?
@@ -62,38 +78,39 @@
 }
 
 abort() {
+	conf_check
 	/usr/sbin/postfix abort 2>/dev/null 1>&2 && success || failure $"$prog abort"
 	return $?
 }
 
 flush() {
+	conf_check
 	/usr/sbin/postfix flush 2>/dev/null 1>&2 && success || failure $"$prog flush"
 	return $?
 }
 
 check() {
+	conf_check
 	/usr/sbin/postfix check 2>/dev/null 1>&2 && success || failure $"$prog check"
 	return $?
 }
 
-restart() {
-	stop
-	start
-}
-
 # See how we were called.
 case "$1" in
   start)
+	[ $running -eq 0 ] && exit 0
 	start
 	;;
   stop)
+	[ $running -eq 0 ] || exit 0
 	stop
 	;;
-  restart)
+  restart|force-reload)
 	stop
 	start
 	;;
   reload)
+	[ $running -eq 0 ] || exit 7
 	reload
 	;;
   abort)
@@ -109,11 +126,13 @@
   	status master
 	;;
   condrestart)
-	[ -f /var/lock/subsys/postfix ] && restart || :
+	[ $running -eq 0 ] || exit 0
+	stop
+	start
 	;;
   *)
 	echo $"Usage: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
-	exit 1
+	exit 2
 esac
 
 exit $?


Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- postfix.spec	13 Aug 2007 16:54:24 -0000	1.57
+++ postfix.spec	4 Oct 2007 13:39:00 -0000	1.58
@@ -39,7 +39,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -466,6 +466,10 @@
 
 
 %changelog
+* Thu Oct  4 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.5-2
+- made init script lsb conform (#243286, rhbz#247025)
+- added link to postfix sasl readme into Postfix-SASL-RedHat readme
+
 * Mon Aug 13 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.5-1
 - new version 2.4.5
 - fixed compile proplem with glibc-2.6.90+