[tomcat6] WIP commit

[Dave Knox]

commit e991b3da9ac82bf3b71809ae688f4794d3adc717
Author: David Knox <dknox at dknox-laptop.(none)>
Date:   Thu Mar 15 16:15:19 2012 -0600

    WIP commit

 sources          |    1 +
 tomcat6-6.0.init |    6 +++---
 tomcat6.spec     |   34 ++++++++++++++++++++++------------
 3 files changed, 26 insertions(+), 15 deletions(-)
---
diff --git a/sources b/sources
index f1dcb10..77e7f4d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 7b811c9092bcb7779bd8df772744ac15  apache-tomcat-6.0.30-src.tar.gz
 19a1eaa9c9938b520d3c360d8cf4af22  apache-tomcat-6.0.32-src.tar.gz
+4d44a7e7610a83ebe930a781257a8b1d  apache-tomcat-6.0.35-src.tar.gz
diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index 4fa698d..dc8a51c 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -120,7 +120,7 @@ function makeHomeDir() {
         cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME
         ln -fs /usr/share/java/tomcat6 ${CATALINA_HOME}/lib
         ln -fs /usr/share/tomcat6/webapps ${CATALINA_HOME}/webapps
-        chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME}
+        chown root:${TOMCAT_USER} /var/log/${NAME}
     fi
 }
 
@@ -165,11 +165,11 @@ function start() {
     export CATALINA_PID="/var/run/${NAME}.pid"
     touch $CATALINA_PID 2>&1 || RETVAL="4"
     if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then 
-      chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
+      chown root:${TOMCAT_USER} $CATALINA_PID
     fi
     [ "$RETVAL" -eq "0" ] && touch $TOMCAT_LOG 2>&1 || RETVAL="4" 
     if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then
-      chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
+      chown root:${TOMCAT_USER} $TOMCAT_LOG
     fi
     if [ "$CATALINA_HOME" != "/usr/share/tomcat6" -a "$RETVAL" -eq "0" ]; then
         # Create a tomcat directory if it doesn't exist
diff --git a/tomcat6.spec b/tomcat6.spec
index 4d2125a..36fa04a 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -31,7 +31,7 @@
 %global jspspec 2.1
 %global major_version 6
 %global minor_version 0
-%global micro_version 32
+%global micro_version 35
 %global packdname apache-tomcat-%{version}-src
 %global servletspec 2.5
 %global elspec 2.1
@@ -53,7 +53,7 @@
 Name:          tomcat6
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       20%{?dist}
+Release:       1%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -77,10 +77,11 @@ Patch0:        %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.p
 Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 # In 6.0.32 source
 #Patch2:        %{name}-%{major_version}.%{minor_version}-rhbz-674601.patch
-Patch3:        %{name}-6.0.32-CVE-2011-2204-rhbz-717016.patch
-Patch4: %{name}-6.0.32-CVE-2011-2526-rhbz-721087.patch
-Patch5: %{name}-6.0.32-CVE-2011-3190-rhbz-738502.patch
-Patch6: %{name}-6.0.32-CVE-2011-1184-rhbz-741407.patch
+# In 6.0.35 source
+#Patch3:        %{name}-6.0.32-CVE-2011-2204-rhbz-717016.patch
+#Patch4: %{name}-6.0.32-CVE-2011-2526-rhbz-721087.patch
+#Patch5: %{name}-6.0.32-CVE-2011-3190-rhbz-738502.patch
+#Patch6: %{name}-6.0.32-CVE-2011-1184-rhbz-741407.patch
 	
 BuildArch:     noarch
 
@@ -230,10 +231,10 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch0 -p0
 %patch1 -p0
 # %patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
+# %patch3 -p0
+# %patch4 -p0
+# %patch5 -p0
+# %patch6 -p0
 
 %{__ln_s} $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar
 %{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar
@@ -435,7 +436,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/nologin -r -d %{homedir} tomcat 2>/dev/null || :
+    -s /sbin/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
@@ -559,7 +560,7 @@ fi
 %attr(0775,root,tomcat) %dir %{tempdir}
 %attr(0775,root,tomcat) %dir %{workdir}
 %attr(0775,root,tomcat) %dir %{logdir}
-%attr(0664,tomcat,tomcat) %{logdir}/catalina.out
+%attr(0664,root,tomcat) %{logdir}/catalina.out
 %dir %{homedir}
 %{bindir}/bootstrap.jar
 %{bindir}/catalina-tasks.xml
@@ -625,9 +626,18 @@ fi
 %{_initrddir}/%{name}
 
 %changelog
+* Mon Feb 06 2012 david knox <dknox at redhat.com> 0:6.0.35-1
+- Update to 6.0.35
+
+* Mon Jan 19 2012 david Knox <dknox at redhat.com> 0:6.0.32-21
+- Resolves: rhbz 701038 user shell changed to sbin versus bin 
+- Resolves: rhbz 781675 ownership for catalina.out changed from 
+- tomcat:tomcat to root:tomcat
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:6.0.32-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
+
 * Thu Oct 20 2011 David Knox <dknox at redhat.com> 0:6.0.32-19
 - Corrected 2011-1183 to 2011-1184