OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 01-Feb-2003 00:39:08
Branch: HEAD Handle: 2003013123390502
Modified files:
openpkg-re/vcheck vc.tomcat
openpkg-src/tomcat tomcat.patch tomcat.spec
openpkg-web news.txt
Log:
upgrade 3.2.4 to 3.3.1a, see
http://online.securityfocus.com/archive/1/309330
Summary:
Revision Changes Path
1.6 +1 -2 openpkg-re/vcheck/vc.tomcat
1.4 +26 -50 openpkg-src/tomcat/tomcat.patch
1.20 +3 -3 openpkg-src/tomcat/tomcat.spec
1.3130 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.tomcat
============================================================================
$ cvs diff -u -r1.5 -r1.6 vc.tomcat
--- openpkg-re/vcheck/vc.tomcat 19 Sep 2002 07:12:51 -0000 1.5
+++ openpkg-re/vcheck/vc.tomcat 31 Jan 2003 23:39:05 -0000 1.6
@@ -2,11 +2,10 @@
}
prog tomcat = {
- disabled
version = 3.2.4
comment = "rse: upgrade needed (ANY HELP APPRECIATED!)"
url = http://jakarta.apache.org/builds/jakarta-tomcat/release/
- regex = v((\d+\.)*\d+)/
+ regex = v(\d+\.\d+\.\d+[a-z]*)/
url =
http://jakarta.apache.org/builds/jakarta-tomcat/release/v__NEWVER__/bin/
regex = jakarta-tomcat-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/tomcat.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 tomcat.patch
--- openpkg-src/tomcat/tomcat.patch 22 Dec 2001 16:21:50 -0000 1.3
+++ openpkg-src/tomcat/tomcat.patch 31 Jan 2003 23:39:07 -0000 1.4
@@ -1,51 +1,27 @@
---- conf/server.xml Fri Dec 21 15:20:07 2001
-+++ conf/server.xml Fri Dec 21 15:22:08 2001
-@@ -68,14 +68,15 @@
- -->
- <Logger name="tc_log"
- verbosityLevel = "INFORMATION"
-+ path="@l_prefix@/var/tomcat/log/tomcat.log"
- />
+--- conf/server.xml.dist Sat Feb 1 00:31:43 2003
++++ conf/server.xml Sat Feb 1 00:33:51 2003
+@@ -15,7 +15,8 @@
+ <TrustedLoader />
+
+ <LogSetter name="tc_log" timestamps="true"
+- verbosityLevel="INFORMATION" />
++ verbosityLevel="INFORMATION"
++ path="@l_prefix@/var/tomcat/log/tomcat.log />
+
+ <LogEvents enabled="false" />
+
+@@ -53,12 +54,12 @@
+ <LogSetter name="servlet_log"
+ timestamps="true"
+ verbosityLevel = "INFORMATION"
+- path="logs/servlet-${yyyyMMdd}.log"
++ path="@l_prefix@/var/tomcat/log/servlet.log"
+ />
+
+ <LogSetter name="JASPER_LOG"
+ timestamps="true"
+- path="logs/jasper-${yyyyMMdd}.log"
++ path="@l_prefix@/var/tomcat/log/jasper.log"
+ verbosityLevel = "INFORMATION" />
- <Logger name="servlet_log"
-- path="logs/servlet.log"
-+ path="@l_prefix@/var/tomcat/log/servlet.log"
- />
-
- <Logger name="JASPER_LOG"
-- path="logs/jasper.log"
-+ path="@l_prefix@/var/tomcat/log/jasper.log"
- verbosityLevel = "INFORMATION" />
-
- <!-- You can add a "home" attribute to represent the "base" for
-@@ -281,12 +282,14 @@
- in the webapps dir and read/write in the workdir.
- -->
-
-+ <!-- FIXME -->
- <Context path="/examples"
- docBase="webapps/examples"
- crossContext="false"
- debug="0"
- reloadable="true" >
- </Context>
-+ <!-- FIXME -->
-
- <!-- Admin context will use tomcat.core to add/remove/get info about
- the webapplications and tomcat internals.
-@@ -295,7 +298,6 @@
- servlets are visible.
-
- If you change this to true, make sure you set a password.
-- -->
- <Context path="/admin"
- docBase="webapps/admin"
- crossContext="true"
-@@ -303,6 +305,7 @@
- reloadable="true"
- trusted="false" >
- </Context>
-+ -->
-
- <!-- Virtual host example -
- In "127.0.0.1" virtual host we'll reverse "/" and
+ <WebXmlReader validate="true" />
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/tomcat.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 tomcat.spec
--- openpkg-src/tomcat/tomcat.spec 8 Jan 2003 15:22:33 -0000 1.19
+++ openpkg-src/tomcat/tomcat.spec 31 Jan 2003 23:39:07 -0000 1.20
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: Web
License: Apache Software License 1.1
-Version: 3.2.4
-Release: 20030108
+Version: 3.3.1a
+Release: 20030201
# list of sources
Source0:
http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
@@ -70,7 +70,7 @@
# unpack vendor distribution and relocate to final location
%{l_tar} -cf - --exclude lib/test \
- bin/*.sh bin/ant bin/antRun conf lib src webapps |\
+ bin/*.sh conf lib webapps |\
( umask 022; \
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/; \
%{l_tar} -xf - )
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3129 -r1.3130 news.txt
--- openpkg-web/news.txt 31 Jan 2003 19:20:05 -0000 1.3129
+++ openpkg-web/news.txt 31 Jan 2003 23:39:06 -0000 1.3130
@@ -1,3 +1,4 @@
+01-Feb-2003: Upgraded package: P<tomcat-3.3.1a-20030201>
31-Jan-2003: Upgraded package: P<as-gui-0.6.7-20030131>
31-Jan-2003: Upgraded package: P<sa-1.0.5-20030131>
31-Jan-2003: Upgraded package: P<ddd-3.3.1-20030131>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
