[tomcat6/f12/master] f12 is using tc6.0.26 and is level set with f13, f14, and f15. Including CVE-2010-2227

[Dave Knox]

commit d41c29270db59334c694996795a001f54358d9ae
Author: david knox <dknox at 78-97-42-72.skybeam.com>
Date:   Tue Oct 12 10:15:48 2010 -0600

    f12 is using tc6.0.26 and is level set with f13, f14, and f15. Including CVE-2010-2227

 tomcat6-6.0-log4j.properties |   11 +++++++++
 tomcat6.spec                 |   49 +++++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 19 deletions(-)
---
diff --git a/tomcat6-6.0-log4j.properties b/tomcat6-6.0-log4j.properties
new file mode 100644
index 0000000..1252a64
--- /dev/null
+++ b/tomcat6-6.0-log4j.properties
@@ -0,0 +1,11 @@
+log4j.rootLogger=debug, R 
+log4j.appender.R=org.apache.log4j.RollingFileAppender 
+log4j.appender.R.File=${catalina.home}/logs/tomcat.log 
+log4j.appender.R.MaxFileSize=10MB 
+log4j.appender.R.MaxBackupIndex=10 
+log4j.appender.R.layout=org.apache.log4j.PatternLayout 
+log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n 
+log4j.logger.org.apache.catalina=DEBUG, R
+log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=DEBUG, R
+log4j.logger.org.apache.catalina.core=DEBUG, R
+log4j.logger.org.apache.catalina.session=DEBUG, R
diff --git a/tomcat6.spec b/tomcat6.spec
index b90e868..eaf2258 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -82,10 +82,12 @@ BuildRequires: ant-trax
 BuildRequires: ecj
 BuildRequires: findutils
 BuildRequires: jakarta-commons-collections
-BuildRequires: jakarta-commons-collections-tomcat5
+#BuildRequires: jakarta-commons-collections-tomcat5
 BuildRequires: jakarta-commons-daemon
-BuildRequires: jakarta-commons-dbcp-tomcat5
-BuildRequires: jakarta-commons-pool-tomcat5
+#BuildRequires: jakarta-commons-dbcp-tomcat5
+BuildRequires: jakarta-commons-dbcp
+#BuildRequires: jakarta-commons-pool-tomcat5
+BuildRequires: jakarta-commons-pool
 BuildRequires: jakarta-taglibs-standard
 BuildRequires: java-1.6.0-devel
 BuildRequires: jpackage-utils >= 0:1.7.0
@@ -167,9 +169,12 @@ Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
 Requires: ecj
-Requires: jakarta-commons-collections-tomcat5
-Requires: jakarta-commons-dbcp-tomcat5
-Requires: jakarta-commons-pool-tomcat5
+Requires: jakarta-commons-collections
+Requires: jakarta-commons-dbcp
+Requires: jakarta-commons-pool
+#Requires: jakarta-commons-collections-tomcat5
+#Requires: jakarta-commons-dbcp-tomcat5
+#Requires: jakarta-commons-pool-tomcat5
 Requires(preun): coreutils
 
 %description lib
@@ -284,6 +289,7 @@ zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
 %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}
 %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir}
+/bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out
 %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir}
 %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
 %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}
@@ -338,8 +344,10 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}
 popd
 
 pushd %{packdname}/output/build
-   %{_bindir}/build-jar-repository lib commons-collections-tomcat5 \
-    commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
+#   %{_bindir}/build-jar-repository lib commons-collections-tomcat5 \
+#    commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
+   %{_bindir}/build-jar-repository lib jakarta-commons-collections \
+    jakarta-commons-dbcp jakarta-commons-pool ecj 2>&1
 # need to use -p here with b-j-r otherwise the examples webapp fails to
 # load with a java.io.IOException
    %{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \
@@ -357,11 +365,14 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
     %{__ln_s} ../%{name}-jsp-%{jspspec}-api-%{version}.jar .
     %{__ln_s} ../%{name}-servlet-%{servletspec}-api-%{version}.jar .
     %{__ln_s} ../%{name}-el-%{elspec}-api-%{version}.jar
-    %{__cp} -p $(build-classpath commons-collections-tomcat5) .
+#    %{__cp} -p $(build-classpath commons-collections-tomcat5) .
+    %{__cp} -p $(build-classpath jakarta-commons-collections) .
     %{__cp} -p $(build-classpath log4j) .
     %{__ln_s} log4j log4j-%{version}.jar
-    %{__ln_s} $(build-classpath commons-dbcp-tomcat5) .
-    %{__ln_s} $(build-classpath commons-pool-tomcat5) .
+#    %{__ln_s} $(build-classpath commons-dbcp-tomcat5) .
+    %{__ln_s} $(build-classpath jakarta-commons-dbcp) .
+#    %{__ln_s} $(build-classpath commons-pool-tomcat5) .
+    %{__ln_s} $(build-classpath jakarta-commons-pool) .
     %{__ln_s} $(build-classpath ecj) jasper-jdt.jar
 popd
 pushd ${RPM_BUILD_ROOT}%{bindir}
@@ -516,13 +527,13 @@ fi
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%attr(0765,root,tomcat) %dir %{basedir}
-%attr(0765,root,tomcat) %dir %{appdir}
-%attr(0765,root,tomcat) %dir %{confdir}
-%attr(0765,root,tomcat) %dir %{confdir}/Catalina
-#%dir %{confdir}
-#%dir %{confdir}/Catalina
-%attr(0765,root,tomcat) %dir %{confdir}/Catalina/localhost
+%attr(0775,root,tomcat) %dir %{basedir}
+%attr(0775,root,tomcat) %dir %{appdir}
+%attr(0775,root,tomcat) %dir %{confdir}
+%attr(0775,root,tomcat) %dir %{confdir}/Catalina
+%attr(0775,root,tomcat) %dir %{logdir}
+%attr(0664,root,tomcat) %dir %{logdir}/catalina.out
+%attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
 %config(noreplace) %{confdir}/%{name}.conf
 %config(noreplace) %{confdir}/*.policy
 %config(noreplace) %{confdir}/*.properties
@@ -533,7 +544,7 @@ fi
 %attr(0765,tomcat,root) %dir %{cachedir}
 %attr(0765,tomcat,root) %dir %{tempdir}
 %attr(0765,tomcat,root) %dir %{workdir}
-%attr(0765,root,tomcat) %dir %{logdir}
+%attr(0775,root,tomcat) %dir %{logdir}
 %dir %{homedir}
 #%attr(0765,root,tomcat) %{homedir}/conf
 %{bindir}/bootstrap-%{version}.jar