[tomcat6/f15/master] resovles rhbz 701038 - nologin regression in f15

Dave Knox dknox at fedoraproject.org
Mon May 2 19:31:31 UTC 2011


commit 0dbc02af3dbcc34d7977d165e35c12835cfcb139
Author: David Knox <dknox at dknox.(none)>
Date:   Mon May 2 13:31:17 2011 -0600

    resovles rhbz 701038 - nologin regression in f15

 tomcat6.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 50ce149..8df4a0a 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
 Name:          tomcat6
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       7%{?dist}
+Release:       8%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -403,7 +403,7 @@ done
 # add the tomcat user and group
 %{_sbindir}/groupadd -g %{tcuid} -r tomcat 2>/dev/null || :
 %{_sbindir}/useradd -c "Apache Tomcat" -u %{tcuid} -g tomcat \
-    -s /bin/sh -r -d %{homedir} tomcat 2>/dev/null || :
+    -s /bin/nologin -r -d %{homedir} tomcat 2>/dev/null || :
 # Save the conf, app, and lib dirs
 # due to rbgz 640686. Copy them to the _tmppath so we don't pollute
 # the tomcat file structure
@@ -564,6 +564,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Mon May 01 2011 David Knox <dknox at redhat.com> - 0:6.0.30-8
+- Resolve: rhbz 701038 - nologin regression in f15
+
 * Mon Apr 11 2011 David Knox <dknox at redhat.com> - 0:6.0.30-7
 - Resolve: rhbz 680447 - finished fixing initscript sourcing error
 - Resolve: rhbz 693292 - manager app doesn't work (directory permissions)


More information about the scm-commits mailing list