CVS tomcat4/debian

[Arnaud Vandyck]

Update of /cvsroot/pkg-java/tomcat4/debian
In directory haydn:/tmp/cvs-serv15526/debian

Modified Files:
	ant.properties changelog control rules tomcat4.postinst 
Log Message:
new upstream

--- /cvsroot/pkg-java/tomcat4/debian/ant.properties	2004/02/16 23:28:25	1.3
+++ /cvsroot/pkg-java/tomcat4/debian/ant.properties	2005/01/06 13:25:32	1.4
@@ -16,4 +16,4 @@
 struts.jar=/usr/share/struts1.1/struts.jar
 xercesImpl.jar=/usr/share/java/xercesImpl.jar
 xmlParserAPIs.jar=/usr/share/java/xmlParserAPIs.jar
-
+jsse.jar=/usr/share/java/jsse.jar
--- /cvsroot/pkg-java/tomcat4/debian/changelog	2004/08/13 11:49:46	1.22
+++ /cvsroot/pkg-java/tomcat4/debian/changelog	2005/01/06 13:25:32	1.23
@@ -1,3 +1,19 @@
+tomcat4 (4.1.31-2) unstable; urgency=low
+
+  * config files are reverted publicly readable because tomcat runs as
+    'tomcat4:nogroup' and the confiles are 'root:root'. So Tomcat4 won't
+    start if the config files are 640!
+
+ -- Arnaud Vandyck <avdyk@debian.org>  Thu,  6 Jan 2005 13:54:32 +0100
+
+tomcat4 (4.1.31-1) unstable; urgency=low
+
+  * New upstream release (closes: #280453)
+  * config file are no more publicly readable (closes: #268002)
+  * added myself as an uploader
+  
+ -- Arnaud Vandyck <avdyk@debian.org>  Thu,  6 Jan 2005 01:08:59 +0100
+
 tomcat4 (4.1.30-6) unstable; urgency=low
 
   * Remove /var/log/tomcat4/catalina.out after stopping Tomcat so downgrades
--- /cvsroot/pkg-java/tomcat4/debian/control	2004/08/13 11:49:46	1.19
+++ /cvsroot/pkg-java/tomcat4/debian/control	2005/01/06 13:25:32	1.20
@@ -2,7 +2,7 @@
 Section: contrib/web
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas@debian.org>
+Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>
 Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), j2sdk1.4, libant1.6-java, libservlet2.3-java, libregexp-java, libcommons-beanutils-java, libcommons-collections-java, libcommons-fileupload-java (>= 1.0-1), libcommons-digester-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java,  libcommons-dbcp-java, libstruts1.1-java, libgnujaf-java, libgnumail-java
 Standards-Version: 3.6.1
 
--- /cvsroot/pkg-java/tomcat4/debian/rules	2004/03/10 10:50:56	1.7
+++ /cvsroot/pkg-java/tomcat4/debian/rules	2005/01/06 13:25:32	1.8
@@ -15,12 +15,13 @@
 # The first two must be specified: This package needs JDK 1.4 to build because
 # of the included JSSE (Java Secure Socket Extension) classes and some parts
 # of ant-optional.
+export JITC_PROCESSOR_TYPE=6
 JAVA_HOME := /usr/lib/j2se/1.4
 ANT_HOME  := /usr/share/ant1.6
 
 # Additional JARs to add to the class path, either full path or just the
 # basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar /usr/local/IBMJava2-ppc-142/jre/lib/security.jar
 
 # Build compiler
 DEB_ANT_COMPILER := modern
@@ -38,4 +39,3 @@
 $(_cdbs_tarball_dir)/jakarta-tomcat:
 	ln -s $(DEB_TAR_SRCDIR) $(_cdbs_tarball_dir)/jakarta-tomcat
 	ln -s $(CONNECTORS_SRCDIR) $(_cdbs_tarball_dir)/jakarta-tomcat-connectors
-
--- /cvsroot/pkg-java/tomcat4/debian/tomcat4.postinst	2004/03/09 21:03:07	1.3
+++ /cvsroot/pkg-java/tomcat4/debian/tomcat4.postinst	2005/01/06 13:25:32	1.4
@@ -33,6 +33,20 @@
 	    mv /etc/tomcat4/tomcat-users.xml \
 		/etc/tomcat4/tomcat-users.xml.dpkg-old || true
 	fi
+	if [ -f /etc/tomcat4/server.xml ]; then
+	    # TODO!
+	    # Reverted to 644 and not 640 because
+	    # this file belong to root:root and tomcat4
+	    # is tomcat:nogroup
+	    chmod 644 /etc/tomcat4/server.xml
+	fi
+	if [ -f /etc/tomcat4/web.xml ]; then
+	    # TODO!
+	    # Reverted to 644 and not 640 because
+	    # this file belong to root:root and tomcat4
+	    # is tomcat:nogroup
+	    chmod 644 /etc/tomcat4/web.xml
+	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)