rpms/openssh/devel openssh.spec,1.167,1.168 sshd.init,1.2,1.3

[Jan F. Chadima]

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26751

Modified Files:
	openssh.spec sshd.init 
Log Message:
Repair initscript to be acord to guidelines



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- openssh.spec	16 Sep 2009 08:12:30 -0000	1.167
+++ openssh.spec	24 Sep 2009 12:34:15 -0000	1.168
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 26%{?dist}%{?rescue_rel}
+Release: 27%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -466,6 +466,10 @@ fi
 %endif
 
 %changelog
+* Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-27
+- Repair initscript to be acord to guidelines (#521860)
+- Add bugzilla# to application of edns and xmodifiers patch
+
 * Wed Sep 16 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-26
 - Changed pam stack to password-auth
 
@@ -499,7 +503,7 @@ fi
 - rebuilt with new openssl
 
 * Thu Jul 30 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-17
-- Added dnssec support.
+- Added dnssec support. (#205842)
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2p1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -528,7 +532,7 @@ fi
 - repair broken ls in chroot %%h
 
 * Fri Jun 12 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-8
-- add XMODIFIERS to exported environment
+- add XMODIFIERS to exported environment (#495690)
 
 * Fri May 15 2009 Tomas Mraz <tmraz at redhat.com> - 5.2p1-6
 - allow only protocol 2 in the FIPS mode


Index: sshd.init
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sshd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sshd.init	12 Feb 2009 18:19:52 -0000	1.2
+++ sshd.init	24 Sep 2009 12:34:16 -0000	1.3
@@ -174,7 +174,7 @@ force_reload() {
 }
 
 rh_status() {
-	status -p $PID_FILE openssh-daemon
+	status -p $PID_FILE $prog	#openssh-daemon
 }
 
 rh_status_q() {
@@ -200,7 +200,12 @@ case "$1" in
 	force-reload)
 		force_reload
 		;;
-	condrestart|try-restart)
+	condrestart)
+		if [ -f /var/lock/subsys/$prog ]; then
+		    	restart
+		fi
+		;;
+	try-restart)
 		rh_status_q || exit 0
 		if [ -f $lockfile ] ; then
 			do_restart_sanity_check