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

[Thomas Woerner (twoerner)]

Author: twoerner

Update of /cvs/pkgs/rpms/postfix/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9022

Modified Files:
	README-Postfix-SASL-RedHat.txt postfix-etc-init.d-postfix 
	postfix.spec 
Log Message:
- FC-f version of postfix-2.4.5-2.fc8 without glibc-2.6.90+ fixes and lsb header



Index: README-Postfix-SASL-RedHat.txt
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-7/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:47:15 -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/F-7/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 10:23:08 -0000	1.10
+++ postfix-etc-init.d-postfix	4 Oct 2007 13:47:15 -0000	1.11
@@ -22,17 +22,22 @@
 # 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 +49,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 +60,7 @@
 }
 
 reload() {
+	conf_check
 	echo -n $"Reloading postfix: "
 	/usr/sbin/postfix reload 2>/dev/null 1>&2 && success || failure $"$prog reload"
 	RETVAL=$?
@@ -62,38 +69,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 +117,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/F-7/postfix.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- postfix.spec	15 Jun 2007 14:04:58 -0000	1.56
+++ postfix.spec	4 Oct 2007 13:47:15 -0000	1.57
@@ -38,8 +38,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.4.3
-Release: 3%{?dist}
+Version: 2.4.5
+Release: 2%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -464,6 +464,14 @@
 
 
 %changelog
+* Thu Oct  4 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.5-2
+- made init script lsb conform (#243286)
+  but without lsb header
+- 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
+
 * Fri Jun 15 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.3-3
 - added missing epoch in requirement of pflogsumm sub package
 
@@ -474,10 +482,12 @@
 - Fixed remaining rewiew problems (rhbz#226307)
 
 * Tue Jun  5 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.3-1
+- allow to build without LDAP but SASL2 support (rhbz#216792)
+
+* Tue Jun  5 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.3-1
 - new stable version 2.4.3
 - enabled mysql support (rhbz#185515)
 - dropped build requirements for gawk, ed and sed
-- allow to build without LDAP but SASL2 support (rhbz#216792)
 
 * Tue Jan 23 2007 Thomas Woerner <twoerner at redhat.com> 2:2.3.6-1
 - new version 2.3.6