Re: Trying again to restart the processing package
Hi David! Good luck with the packaging. Last week I was using processing for something and remembered this ITP. I should have dropped it, thanks for taking it. I had a working build for processing for a very old version (which was doing the build as a series of scripts). The newer versions use a much saner system, so my work is no longer relevant. If you have something, I can help you test it and if you want to bounce ideas, I'll be at #debian-java again (I'm DrDub). Great news! P. __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Re: Debian Java meetup @ NYC Saturday 31
WORKSFORME ;-) __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#572982: azureus: Multiple license issues.
At debian-java we're pretty happy with the exception and we didn't feel the need to run it through -legal. I haven't had time to make an upload with the exception documented in the debian/ folder so the bug it is still open (but the packaged didn't get removed, which is the important part :-) P. __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#572982: Forwarded
(my previous e-mail about Sleak.java missed the main issue that is GPL azureus using EPL SWT.) This bug has been forwarded to upstream's bug report forum: http://forum.vuze.com/thread.jspa?threadID=90780 signature.asc Description: This is a digitally signed message part. __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#572982: Deleting Sleak.java
Further looking into this matter, the file that Niels talks about is a debugging aid, as described here: http://www.eclipse.org/articles/swt-design-2/sleak.htm it can be easily deleted during build (and the same goes with org/gudy/azureus2/ui/swt/Sleak.java ) I can commit a patch for this next weekend or other people are welcome to take care of it. (It doesn't build cleanly in my sid chroot, although.) Best regards, Pablo signature.asc Description: This is a digitally signed message part. __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[pkg-java] r11869 - in trunk/processing: . patches
Author: pabloduboue-guest
Date: 2010-03-15 06:37:26 + (Mon, 15 Mar 2010)
New Revision: 11869
Added:
trunk/processing/TODO
trunk/processing/files
trunk/processing/processing-binary
trunk/processing/processing-doc.install
trunk/processing/processing-doc.substvars
trunk/processing/processing.substvars
Removed:
trunk/processing/javabuild
trunk/processing/processing.links
trunk/processing/processing.manifest
Modified:
trunk/processing/control
trunk/processing/orig-tar.sh
trunk/processing/patches/01_fix_make_script.patch
trunk/processing/processing.install
trunk/processing/rules
Log:
Fixed orig.tar.sh to avoid downloaded unlicensed files (e.g., JRE)
Finished fixing the make.sh script
This version produces two .deb, but more work is needed.
Added: trunk/processing/TODO
===
--- trunk/processing/TODO (rev 0)
+++ trunk/processing/TODO 2010-03-15 06:37:26 UTC (rev 11869)
@@ -0,0 +1,2 @@
+Man page
+Desktop icon
Modified: trunk/processing/control
===
--- trunk/processing/control2010-03-15 00:50:08 UTC (rev 11868)
+++ trunk/processing/control2010-03-15 06:37:26 UTC (rev 11869)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Pablo Duboue pablo.dub...@gmail.com
-Build-Depends: debhelper ( 7), javahelper (= 0.24)
+Build-Depends: debhelper ( 7), javahelper (= 0.24), librxtx-java,
libjna-java, libantlr-java, libjogl-java, libitext-java, liblog4j1.2-java, perl
Build-Depends-Indep: openjdk-6-jdk
Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/processing
@@ -21,4 +21,19 @@
fundamentals of computer programming within a visual context and to
serve as a software sketchbook and professional production tool.
Processing is developed by artists and designers as an alternative to
- proprietary software tools in the same domain.
\ No newline at end of file
+ proprietary software tools in the same domain.
+
+Package: processing-doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: A programming language for images, animations, and interactions
+ Processing is a programming language and environment for people who
+ want to program images, animation, and interactions. It is used by
+ students, artists, designers, researchers, and hobbyists for
+ learning, prototyping, and production. It is created to teach
+ fundamentals of computer programming within a visual context and to
+ serve as a software sketchbook and professional production tool.
+ Processing is developed by artists and designers as an alternative to
+ proprietary software tools in the same domain.
+ .
+ This package contains the documentation.
\ No newline at end of file
Added: trunk/processing/files
===
--- trunk/processing/files (rev 0)
+++ trunk/processing/files 2010-03-15 06:37:26 UTC (rev 11869)
@@ -0,0 +1,2 @@
+processing_1.0.9-1_all.deb java optional
+processing-doc_1.0.9-1_all.deb java optional
Deleted: trunk/processing/javabuild
===
--- trunk/processing/javabuild 2010-03-15 00:50:08 UTC (rev 11868)
+++ trunk/processing/javabuild 2010-03-15 06:37:26 UTC (rev 11869)
@@ -1 +0,0 @@
-processing.jar src
Modified: trunk/processing/orig-tar.sh
===
--- trunk/processing/orig-tar.sh2010-03-15 00:50:08 UTC (rev 11868)
+++ trunk/processing/orig-tar.sh2010-03-15 06:37:26 UTC (rev 11869)
@@ -1,27 +1,44 @@
-#!/bin/sh -e
+#!/bin/bash -e
TAR=../processing_$2.orig.tar.gz
DIR=processing-$2
TAG=processing-$2
-svn export svn://processing.org/tags/$TAG/ $DIR
-rm -rf $DIR/build/windows
-rm -rf $DIR/build/macosx
-rm -rf $DIR/app/lib
-rm $DIR/build/linux/jre.tgz
-rm $DIR/*/library/*
-rm $DIR/app/src/processing/app/tools/format/tool/log4j.jar
-rm $DIR/app/src/processing/app/tools/format/tool/jalopy.jar
-rm $DIR/core/preproc/preproc.jar
-rm $DIR/dxf/dxfviewer.jar
-# netscape.javascript now in /usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar
-rm -rf $DIR/build/shared/libraries/
-rm $DIR/app/src/processing/app/tools/android/processing-core.zip
-rm $DIR/video/QTJava.zip
-rm $DIR/opengl/jogl-src.zip
-rm $DIR/pdf/itext-src.zip
+# their SVN is full of non-distributable files, so extra care is needed to
fetch it
+# the list of files might need to be moved to /tmp if there are problems with
the
+# buildd
+# get list
+svn --recursive list svn://processing.org/tags/$TAG/ list
+# remove unwanted bits
+grep -v ^build/windows list list.filtered; mv list.filtered list
+grep -v ^build/macosx list list.filtered; mv list.filtered list
+grep -v ^app/lib list list.filtered; mv list.filtered list
+grep -v ^build
[pkg-java] r11870 - in trunk/processing: . exec
Author: pabloduboue-guest
Date: 2010-03-15 06:56:51 + (Mon, 15 Mar 2010)
New Revision: 11870
Added:
trunk/processing/exec/
trunk/processing/exec/processing
Removed:
trunk/processing/processing-binary
Modified:
trunk/processing/control
trunk/processing/processing.install
trunk/processing/rules
Log:
This version install and executes, more testing to follow
Modified: trunk/processing/control
===
--- trunk/processing/control2010-03-15 06:37:26 UTC (rev 11869)
+++ trunk/processing/control2010-03-15 06:56:51 UTC (rev 11870)
@@ -12,7 +12,7 @@
Package: processing
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+Depends: openjdk-6-jdk, librxtx-java, libjna-java, libantlr-java,
libjogl-java, libitext-java, liblog4j1.2-java
Description: A programming language for images, animations, and interactions
Processing is a programming language and environment for people who
want to program images, animation, and interactions. It is used by
Added: trunk/processing/exec/processing
===
--- trunk/processing/exec/processing(rev 0)
+++ trunk/processing/exec/processing2010-03-15 06:56:51 UTC (rev 11870)
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+CLASSPATH=/usr/share/java/antlr.jar:/usr/share/java/ecj.jar:/usr/share/java/jna.jar:/usr/share/java/RXTXcomm.jar:/usr/share/java/jogl.jar:/usr/share/java/itext.jar:/usr/share/processing/lib/core.jar:/usr/share/processing/lib/pde.jar:/usr/lib/jvm/java-6-openjdk/lib/rt.jar:/usr/lib/jvm/java-6-openjdk/lib/tools.jar
+
+cd /usr/share/processing
+
+/usr/lib/jvm/java-6-openjdk/bin/java -classpath $CLASSPATH processing.app.Base
\ No newline at end of file
Deleted: trunk/processing/processing-binary
===
--- trunk/processing/processing-binary 2010-03-15 06:37:26 UTC (rev 11869)
+++ trunk/processing/processing-binary 2010-03-15 06:56:51 UTC (rev 11870)
@@ -1,7 +0,0 @@
-#!/usr/bin/sh -e
-
-CLASSPATH=/usr/share/java/antlr.jar:/usr/share/java/ecj.jar:/usr/share/java/jna.jar:/usr/share/java/RXTXcomm.jar:/usr/share/java/jogl.jar:/usr/share/java/itext.jar:/usr/share/processing/lib/core.jar:/usr/share/processing/lib/pde.jar:/usr/lib/jvm/java-6-openjdk/lib/rt.jar:/usr/lib/jvm/java-6-openjdk/lib/tools.jar
-
-cd /usr/share/processing
-
-/usr/lib/jvm/java-6-openjdk -classpath $CLASSPATH processing.app.Base
\ No newline at end of file
Modified: trunk/processing/processing.install
===
--- trunk/processing/processing.install 2010-03-15 06:37:26 UTC (rev 11869)
+++ trunk/processing/processing.install 2010-03-15 06:56:51 UTC (rev 11870)
@@ -1,6 +1,7 @@
build/shared/lib/* usr/share/processing/lib/
build/shared/tools/* usr/share/processing/tools/
-build/linux/work/examples usr/share/doc/processing/
+debian/examples.txt usr/share/processing/
+build/linux/work/examples usr/share/processing/
build/linux/work/lib/pde.jar usr/share/processing/lib/
build/linux/work/lib/core.jar usr/share/processing/lib/
net usr/share/processing/libraries/
@@ -8,4 +9,4 @@
serial usr/share/processing/libraries/
pdf usr/share/processing/libraries/
dxf usr/share/processing/libraries/
-debian/processing-binary usr/bin/processing
+debian/exec/processing usr/bin/
Modified: trunk/processing/rules
===
--- trunk/processing/rules 2010-03-15 06:37:26 UTC (rev 11869)
+++ trunk/processing/rules 2010-03-15 06:56:51 UTC (rev 11870)
@@ -24,6 +24,7 @@
dh_testdir
dh_testroot
cd ./build/linux; JAVA_HOME=$(JAVA_HOME) ./make.sh
+ find build/linux/work -name .svn -exec rm -rf {} 2 /dev/null ';' ||
true
dh_install
dh_installchangelogs build/shared/revisions.txt
dh_compress
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r11871 - trunk/processing
Author: pabloduboue-guest
Date: 2010-03-15 08:28:11 + (Mon, 15 Mar 2010)
New Revision: 11871
Added:
trunk/processing/examples.txt
Modified:
trunk/processing/rules
Log:
Fixed to work on sid
Added: trunk/processing/examples.txt
===
--- trunk/processing/examples.txt (rev 0)
+++ trunk/processing/examples.txt 2010-03-15 08:28:11 UTC (rev 11871)
@@ -0,0 +1 @@
+The examples are in /usr/share/processing/examples
Modified: trunk/processing/rules
===
--- trunk/processing/rules 2010-03-15 06:56:51 UTC (rev 11870)
+++ trunk/processing/rules 2010-03-15 08:28:11 UTC (rev 11871)
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/buildvars.mk
#include /usr/share/cdbs/1/rules/debhelper.mk
#include /usr/share/cdbs/1/class/ant.mk
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -17,12 +18,16 @@
# Put depended upon jars in here
#export CLASSPATH=
-#%:
-# dh --with javahelper $@
binary:
dh_testdir
dh_testroot
+ chmod +x ./build/linux/make.sh
+ mkdir serial/library || true
+ mkdir net/library || true
+ mkdir opengl/library || true
+ mkdir pdf/library || true
+ mkdir dxf/library || true
cd ./build/linux; JAVA_HOME=$(JAVA_HOME) ./make.sh
find build/linux/work -name .svn -exec rm -rf {} 2 /dev/null ';' ||
true
dh_install
@@ -45,3 +50,6 @@
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
+
+%:
+ dh $@
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r11872 - in trunk/processing: . patches
Author: pabloduboue-guest Date: 2010-03-15 12:40:27 + (Mon, 15 Mar 2010) New Revision: 11872 Modified: trunk/processing/patches/01_fix_make_script.patch trunk/processing/rules Log: Fixed patch. Modified: trunk/processing/patches/01_fix_make_script.patch === --- trunk/processing/patches/01_fix_make_script.patch 2010-03-15 08:28:11 UTC (rev 11871) +++ trunk/processing/patches/01_fix_make_script.patch 2010-03-15 12:40:27 UTC (rev 11872) @@ -1,149 +1,149 @@ Description: Fix the make.sh script to work with Debian Author: Pablo Duboue -diff -Nurwd build/linux/make.sh build/linux/make-old.sh ./build/linux/make.sh 2010-03-15 02:10:48.0 -0400 -+++ ./build/linux/make-old.sh 2008-10-11 11:39:23.0 -0400 -@@ -1,11 +1,8 @@ --#!/bin/sh -e -+#!/bin/sh +diff -up build/linux/make-old.sh build/linux/make.sh +--- ./build/linux/make-old.sh 2008-10-11 11:39:23.0 -0400 ./build/linux/make.sh 2010-03-15 02:10:48.0 -0400 +@@ -1,8 +1,11 @@ +-#!/bin/sh ++#!/bin/sh -e ### -- SETUP WORK DIR --- --JAVA=$JAVA_HOME/bin/java --JAVAC=$JAVA_HOME/bin/javac -- ++JAVA=$JAVA_HOME/bin/java ++JAVAC=$JAVA_HOME/bin/javac ++ if test -d work then BUILD_PREPROC=false -@@ -15,8 +12,12 @@ +@@ -12,12 +15,8 @@ else mkdir work cp -r ../shared/lib work/ -+ cp -r ../shared/libraries work/ +- cp -r ../shared/libraries work/ cp -r ../shared/tools work/ -- mkdir work/libraries/ -+ -+ cp ../../app/lib/antlr.jar work/lib/ -+ cp ../../app/lib/ecj.jar work/lib/ -+ cp ../../app/lib/jna.jar work/lib/ +- +- cp ../../app/lib/antlr.jar work/lib/ +- cp ../../app/lib/ecj.jar work/lib/ +- cp ../../app/lib/jna.jar work/lib/ ++ mkdir work/libraries/ echo Extracting examples... unzip -q -d work/ ../shared/examples.zip -@@ -32,6 +33,26 @@ +@@ -33,26 +32,6 @@ else cp -r ../../dxf work/libraries/ install -m 755 dist/processing work/processing -+ -+ ARCH=`uname -m` -+ if [ $ARCH = i686 ] -+ then -+echo Extracting JRE... -+tar --extract --file=jre.tgz --ungzip --directory=work -+ else -+#echo This is not my beautiful house. -+#if [ $ARCH = x86_64 ] -+#then -+# echo You gots the 64. -+#fi -+echo -+The Java bundle that is included with Processing supports only i686 by default. -+To build the code, you will need to install the Java 1.5.0_15 JDK (not a JRE, -+and not any other version), and create a symlink to the directory where it is -+installed. Create the symlink in the \work\ directory, and named it \java\: -+ln -s /path/to/jdk1.5.0_15 `pwd`/work/java -+exit -+ fi +- +- ARCH=`uname -m` +- if [ $ARCH = i686 ] +- then +-echo Extracting JRE... +-tar --extract --file=jre.tgz --ungzip --directory=work +- else +-#echo This is not my beautiful house. +-#if [ $ARCH = x86_64 ] +-#then +-# echo You gots the 64. +-#fi +-echo +-The Java bundle that is included with Processing supports only i686 by default. +-To build the code, you will need to install the Java 1.5.0_15 JDK (not a JRE, +-and not any other version), and create a symlink to the directory where it is +-installed. Create the symlink in the \work\ directory, and named it \java\: +-ln -s /path/to/jdk1.5.0_15 `pwd`/work/java +-exit +- fi fi cd ../.. -@@ -45,12 +66,12 @@ +@@ -66,12 +45,12 @@ echo Building processing.core cd core #CLASSPATH=../build/linux/work/java/lib/rt.jar --#export CLASSPATH= -+#export CLASSPATH +-#export CLASSPATH ++#export CLASSPATH= perl preproc.pl mkdir -p bin --$JAVA \ ---cp $JAVA_HOME/lib/tools.jar \ -+../build/linux/work/java/bin/java \ -+-cp ../build/linux/work/java/lib/tools.jar \ +-../build/linux/work/java/bin/java \ +--cp ../build/linux/work/java/lib/tools.jar \ ++$JAVA \ ++-cp $JAVA_HOME/lib/tools.jar \ com.sun.tools.javac.Main \ -d bin -source 1.5 -target 1.5 \ src/processing/core/*.java src/processing/xml/*.java -@@ -73,8 +94,8 @@ +@@ -94,8 +73,8 @@ cd app echo Building antlr grammar code... # first build the default java goop --$JAVA \ -- -cp /usr/share/java/antlr.jar antlr.Tool \ -+../build/linux/work/java/bin/java \ -+ -cp ../build/linux/work/lib/antlr.jar antlr.Tool \ +-../build/linux/work/java/bin/java \ +- -cp ../build/linux/work/lib/antlr.jar antlr.Tool \ ++$JAVA \ ++ -cp /usr/share/java/antlr.jar antlr.Tool \ -o src/antlr/java \ src/antlr/java/java.g -@@ -87,8 +108,8 @@ +@@ -108,8 +87,8 @@ cd app # so it's necessary to cd into the antlr/java folder, otherwise # the JavaTokenTypes.txt file won't be found cd src/antlr/java --$JAVA \ -- -cp /usr/share/java/antlr.jar antlr.Tool \ -+../../../../build/linux/work/java/bin/java \ -+ -cp ../../../../build/linux/work/lib
Bug#572982: EPL + LGPL compatiblity?
Hi, We seek some advice regarding #572982 [1] (azureus, a well-known torrent client, combines source licensed under incompatible licenses). From Niels quoted sources, there is no doubt about the incompatibility of GPL and EPL. But LGPL and EPL might be a different matter and Google has proved quite unfriendly on this regard. Any advice on the matter will be highly appreciated. Thanks, Pablo [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572982 signature.asc Description: This is a digitally signed message part. ___ pkg-java-maintainers mailing list pkg-java-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
Bug#554853: [jetty-user] Running Jetty on port 80 with SetUIDServer
On Monday 15 February 2010, you wrote: Hello, I've been struggling to run Jetty on port 80 using the setuid feature documented here: http://docs.codehaus.org/display/JETTY/port80. This is on a 64bit version of Ubuntu 9.10 on an EC2 instance. Per the documentation at /usr/share/doc/jetty/README.Debian, I have installed the following packages: jetty libjetty-java libjetty-extra-java Hi Mike, I'm part of debian-java, the team that packaged Jetty for Debian (and I guess Ubuntu). Which version are you using? You seem to have a case for Debian bug #554853 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554853 the original submitter never followed up with us. I'm cc:ing the bug to add your e-mail to our BTS. I'd love to close this bug and to put information in the README.Debian that makes clear how to go about this. Next, I edit /etc/default/jetty and set the following options: NO_START=0 JETTY_USER=root JETTY_PORT=80 /etc/jetty/jetty.conf contains the following (jetty-setuid.xml is first, per the documentation): # list of jetty configuration and property files /etc/jetty/jetty-setuid.xml /etc/jetty/jetty-logging.xml /etc/jetty/jetty.xml /etc/jetty/jetty-shared-webapps.xml /etc/jetty/jetty-setuid.xml contains the following. Note that I had to use the uid and gid *numbers* for the jetty user (rather than the actual user/group names) in order to avoid a configuration exception: Configure id=Server class=org.mortbay.setuid.SetUIDServer Set name=startServerAsPrivilegedfalse/Set Set name=umask2/Set Set name=uid110/Set Set name=gid118/Set /Configure Now when I start jetty using /etc/init.d/jetty start, I get an exception in /var/log/jetty/out.log: 236 [main] WARN org.mortbay.log - Nested in java.lang.reflect.InvocationTargetException: java.io.IOException: Cannot write log directory /var/log/jetty Permissions for that directory are as follows: drwxr-x--- 2 jettyadm4096 2010-02-15 14:53 jetty Obviously, both the root and Jetty user already have write access to this directory, but just for fun, I'll chmod it 777. This gets me a little further by creating this file: -rw-r--r-- 1 root root 1563 2010-02-15 15:01 2010_02_15.stderrout.log But it contains another exception: 281 [main] WARN org.mortbay.log - failed setuidser...@30ec4a87: java.net.SocketException: Permission denied Has anyone else gotten this to work? Is there something obvious that I'm doing wrong? signature.asc Description: This is a digitally signed message part. ___ pkg-java-maintainers mailing list pkg-java-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
[pkg-java] r11497 - tags/jetty
Author: pabloduboue-guest Date: 2010-02-03 07:03:55 + (Wed, 03 Feb 2010) New Revision: 11497 Added: tags/jetty/6.1.22-1/ Log: tagged version of packaged release ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
Bug#558291: (no subject)
Actually, upstream has already modernized its autoconf scripts on their CVS as part of their work on version 0.99. Patching version 0.98 plus Winnie's fixes to the control file fixes this bug. I'm part of the team that maintains the package, so I'll check the fixes into our Alioth SVN, run a number of tests and post the package for upload. signature.asc Description: This is a digitally signed message part. ___ pkg-java-maintainers mailing list pkg-java-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
Bug#558291: (no subject)
More progress: The libtool error is related to the --tags parameter. The generated libtool script defines only the tag CXX and the generated Makefile.in use --tag=CC. Changing the many Makfile.in that invoke libtool to use CXX instead of CC builds the package to completion. Now I'm trying to figure out whether the problem is in autoconf or if there's anything being set wrongly. P. signature.asc Description: This is a digitally signed message part. ___ pkg-java-maintainers mailing list pkg-java-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
[pkg-java] r11325 - trunk
Author: pabloduboue-guest Date: 2010-01-04 09:20:01 + (Mon, 04 Jan 2010) New Revision: 11325 Added: trunk/processing/ Log: preparing for initial import ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r11326 - in trunk/processing: . patches
Author: pabloduboue-guest
Date: 2010-01-04 09:20:44 + (Mon, 04 Jan 2010)
New Revision: 11326
Added:
trunk/processing/changelog
trunk/processing/compat
trunk/processing/control
trunk/processing/copyright
trunk/processing/javabuild
trunk/processing/orig-tar.sh
trunk/processing/patches/
trunk/processing/patches/01_fix_make_script.patch
trunk/processing/patches/series
trunk/processing/processing.install
trunk/processing/processing.links
trunk/processing/processing.manifest
trunk/processing/rules
trunk/processing/watch
Log:
initial import (work in progress)
Added: trunk/processing/changelog
===
--- trunk/processing/changelog (rev 0)
+++ trunk/processing/changelog 2010-01-04 09:20:44 UTC (rev 11326)
@@ -0,0 +1,5 @@
+processing (1.0.9-1) unstable; urgency=low
+
+ * Initial release. (Closes: #433270)
+
+ -- Pablo Duboue pablo.dub...@gmail.com Mon, 04 Jan 2010 03:15:17 -0500
Added: trunk/processing/compat
===
--- trunk/processing/compat (rev 0)
+++ trunk/processing/compat 2010-01-04 09:20:44 UTC (rev 11326)
@@ -0,0 +1 @@
+7
Added: trunk/processing/control
===
--- trunk/processing/control(rev 0)
+++ trunk/processing/control2010-01-04 09:20:44 UTC (rev 11326)
@@ -0,0 +1,24 @@
+Source: processing
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
+Uploaders: Pablo Duboue pablo.dub...@gmail.com
+Build-Depends: debhelper ( 7), javahelper (= 0.24)
+Build-Depends-Indep: openjdk-6-jdk
+Standards-Version: 3.8.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/processing
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/processing
+Homepage: http://processing.org
+
+Package: processing
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Description: A programming language for images, animations, and interactions
+ Processing is a programming language and environment for people who
+ want to program images, animation, and interactions. It is used by
+ students, artists, designers, researchers, and hobbyists for
+ learning, prototyping, and production. It is created to teach
+ fundamentals of computer programming within a visual context and to
+ serve as a software sketchbook and professional production tool.
+ Processing is developed by artists and designers as an alternative to
+ proprietary software tools in the same domain.
\ No newline at end of file
Added: trunk/processing/copyright
===
--- trunk/processing/copyright (rev 0)
+++ trunk/processing/copyright 2010-01-04 09:20:44 UTC (rev 11326)
@@ -0,0 +1,29 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Processing
+Maintainer: Ben Fry and Casey Reas and the Processing developer team
+Source: http://processing.org/
+Disclaimer: WIP
+
+Files: *
+Copyright: 2004-2010, Ben Fry and Casey Reas and the Processing developer team
+License: GPL-2
+
+Files: app/src/processing/app/syntax/JEditTextArea.java
+Copyright: 1998-1999, Slava Pestov, Artur Biesiadowski, Clancy Malcolm,
Jonathan Revusky, Juha Lindfors and Mike Dillon
+License:
+ You may use and modify this package for any purpose. Redistribution is
+ permitted, in both source and binary form, provided that this notice
+ remains intact in all source distributions of this package.
+
+Files: debian/*
+Copyright: 2010, Pablo Duboue pablo.dub...@gmail.com
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
+
+License: GPL-2
+ On Debian GNU/Linux system you can find the complete text of the
+ LGPL 2 license in '/usr/share/common-licenses/GPL-2'.
+
Added: trunk/processing/javabuild
===
--- trunk/processing/javabuild (rev 0)
+++ trunk/processing/javabuild 2010-01-04 09:20:44 UTC (rev 11326)
@@ -0,0 +1 @@
+processing.jar src
Added: trunk/processing/orig-tar.sh
===
--- trunk/processing/orig-tar.sh(rev 0)
+++ trunk/processing/orig-tar.sh2010-01-04 09:20:44 UTC (rev 11326)
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+TAR=../processing_$2.orig.tar.gz
+DIR=processing-$2
+TAG=processing-$2
+
+svn export svn://processing.org/tags/$TAG/ $DIR
+rm -rf $DIR/build/windows
+rm -rf $DIR/build/macosx
+rm -rf $DIR/app/lib
+rm $DIR/build/linux/jre.tgz
+rm $DIR/*/library/*
+rm $DIR/app/src/processing/app/tools/format/tool/log4j.jar
+rm $DIR/app/src/processing/app/tools/format/tool/jalopy.jar
+rm $DIR/core/preproc
Question about team maintained packages and an upcoming ITP
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hello, I have been thinking about ITP'ing Processing 1.0 [1] (a programming language on top of Java used for interaction programming). Can I keep its debian folder under our Alioth project and list it as team maintained? Can I still use the alioth project if (for whatever reason) it is better not to have it as team maintained at the beginning? There's a wishlist for in Ubuntu for almost a year now [2] and I have been using upstream tar ball in Squeeze with quite a bit of success. If other people would like to help, by all means let me know. I'm going by DrDub in OFTC. Best regards, Pablo [1] http://processing.org/ [2] https://bugs.launchpad.net/ubuntu/+bug/316416 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBCAAGBQJLOaODAAoJEMJ09r9KJ69qPKcQALUUcqy6Te1IS1vDKtPE2VoF BM+LJ10sN4ndYp027xl+g64OZlLwQEkc2v/6qWPkPpdZt1ngTigqPSDlU+W4fMUT D0e0FQGK9FbMTymccT8deCiJGBzYQiEtjhxpeC4Ta6OtPUSI5l5F+mwgoUTfZKvu WSYuXyCFgWvol9n3wehtYBFAhxzJoYYleT1r2zf4B77VmZwa4ZvrAD2iH4SKQxJS mcZ3uGGHZz3mlU2fqxyfQVCY5yomcTHrPohEI9VJlrpHqlTPTmdwYB37y4N4o8al ffvyHNUulprvBP522ymgk7mASCigE0oqXT8sZCJeMMziG8Y7vFKs1UJfRDLh4wph jPOnrlD/5b5YBJHXgjmUUKFbAYKpJ5zkQ6d8dOqf5X9tJRk78pgnbUBt8FpuhcEP 93S/1vuQmOchXoa/nqd5CDIq0Id++IoZgTl4Cx6Qd3XoHLc7g2j4YAQ3lw8iLFjP Hf0kyWEcJcSur6KYVz75PeH9qYedFuNUwids6wXsA0LJaU71ZTAPkgJJH+ptx+Ru TzAfW2p93nol1AFHOnZFhOixYfMUXI1h3zuRnWhX8gdgeCwNPEGHEd/+MH5OiOcV E2EMqR3JSqgQkMvdUhLqIYeqFTWfUvrXHId1G7rlq61yUjIsmvdR7+2QifVv3q5y kacWi7mlveV2kQT8dEDy =suXk -END PGP SIGNATURE- ___ pkg-java-maintainers mailing list pkg-java-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
[pkg-java] r11297 - trunk/jetty/debian
Author: pabloduboue-guest Date: 2009-12-16 21:31:21 + (Wed, 16 Dec 2009) New Revision: 11297 Modified: trunk/jetty/debian/orig-tar.sh Log: fixed self destruct behavior, where get-orig will also delete its own folder Modified: trunk/jetty/debian/orig-tar.sh === --- trunk/jetty/debian/orig-tar.sh 2009-12-16 15:08:01 UTC (rev 11296) +++ trunk/jetty/debian/orig-tar.sh 2009-12-16 21:31:21 UTC (rev 11297) @@ -14,7 +14,9 @@ rm -r $DIR/contrib/maven-beanshell-plugin tar -c -z -f $TAR $DIR -rm -rf $DIR ../$TAG +# drop ../$TAG to avoid self-destruct behavior +#rm -rf $DIR ../$TAG +rm -rf $DIR # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
Bug#553644:
fixed 6.1.22 thanks We don't ship the test WebApps enabled by default (from what I can gather, it seems we don't ship them at all) and this new version fixes the remaining XSS vulnerabilities (I double checked the fix is in). This bug will be closed when the new version gets uploaded. ___ pkg-java-maintainers mailing list pkg-java-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
[pkg-java] r11294 - trunk/jetty/debian
Author: pabloduboue-guest
Date: 2009-12-16 07:23:22 + (Wed, 16 Dec 2009)
New Revision: 11294
Modified:
trunk/jetty/debian/changelog
trunk/jetty/debian/control
trunk/jetty/debian/module.xml
Log:
Added myself to uploaders
Added fix to changelog, plus get it ready for upload
Modified ant script to include the manifests
Modified: trunk/jetty/debian/changelog
===
--- trunk/jetty/debian/changelog2009-12-15 09:43:50 UTC (rev 11293)
+++ trunk/jetty/debian/changelog2009-12-16 07:23:22 UTC (rev 11294)
@@ -1,6 +1,6 @@
-jetty (6.1.22-1) UNRELEASED; urgency=low
+jetty (6.1.22-1) unstable; urgency=medium
- * New upstream release.
+ * New upstream release. (Closes: #553644)
* Added OSGi bundle metadata (by upstream). (Closes: #558187)
* Corrected path to jetty web-apps (by Niels Thykier). (Closes: #554877)
Modified: trunk/jetty/debian/control
===
--- trunk/jetty/debian/control 2009-12-15 09:43:50 UTC (rev 11293)
+++ trunk/jetty/debian/control 2009-12-16 07:23:22 UTC (rev 11294)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Michael Koch konque...@gmx.de, Thierry Carrez
thierry.car...@ubuntu.com,
Ludovic Claude ludovic.cla...@laposte.net, Torsten Werner
twer...@debian.org,
- Niels Thykier ni...@thykier.net
+ Niels Thykier ni...@thykier.net, Pablo Duboue pablo.dub...@gmail.com
Build-Depends: debhelper (= 6), cdbs ( 0.4.5.3), openjdk-6-jdk, ant,
maven-repo-helper,
libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java,
libgnujaf-java, libcommons-daemon-java, quilt
Modified: trunk/jetty/debian/module.xml
===
--- trunk/jetty/debian/module.xml 2009-12-15 09:43:50 UTC (rev 11293)
+++ trunk/jetty/debian/module.xml 2009-12-16 07:23:22 UTC (rev 11294)
@@ -37,9 +37,11 @@
listfiles=true/
echogenerating ${jar.file}/echo
+property name=manifest.file value=${rsrc.dir}/META-INF/MANIFEST.MF/
+available file=${manifest.file} type=file
property=manifest.file.exists/
available file=${rsrc.dir} type=dir property=rsrc.dir.exists/
-antcall target=generate-jar-with-manifest/
-antcall target=generate-jar/
+antcall target=generate-jar-with-given-manifest/
+antcall target=generate-jar-without-given-manifest/
echocopying ${jar.file} to ${module-libdir}/echo
copy file=${target.dir}/${jar.file} todir=${module-libdir}/
@@ -53,6 +55,16 @@
antcall target=jar/
/target
+ target name=generate-jar-with-given-manifest if=manifest.file.exists
+antcall target=jar-with-given-manifest-and-resources/
+antcall target=jar-with-given-manifest/
+ /target
+
+ target name=generate-jar-without-given-manifest
unless=manifest.file.exists
+antcall target=generate-jar-with-manifest/
+antcall target=generate-jar/
+ /target
+
target name=generate-jar-with-manifest if=jar.main.class
antcall target=jar-with-manifest-and-resources/
antcall target=jar-with-manifest/
@@ -102,6 +114,28 @@
/jar
/target
+ target name=jar-with-given-manifest unless=rsrc.dir.exists
+jar destfile=${target.dir}/${jar.file} manifest=${manifest.file}
+ fileset dir=${build.dir}
+include name=**/*/
+ /fileset
+ fileset dir=${rsrc.dir}
+include name=**/*/
+ /fileset
+/jar
+ /target
+
+ target name=jar-with-given-manifest-and-resources if=rsrc.dir.exists
+jar destfile=${target.dir}/${jar.file} manifest=${manifest.file}
+ fileset dir=${build.dir}
+include name=**/*/
+ /fileset
+ fileset dir=${rsrc.dir}
+include name=**/*/
+ /fileset
+/jar
+ /target
+
target name=copy-to-etc if=config.dir.exists
echocopying ${config.dir} to ${etc.dir} from ${module-name}/echo
copy todir=${etc.dir}
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
Bug#553644:
fixed 553644 6.1.22 thanks (resending as I forgot to CC: the BTS) We don't ship the test WebApps enabled by default (from what I can gather, it seems we don't ship them at all) and this new version fixes the remaining XSS vulnerabilities (I double checked the fix is in). This bug will be closed when the new version gets uploaded. ___ pkg-java-maintainers mailing list pkg-java-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
[pkg-java] r11295 - trunk/jetty/debian
Author: pabloduboue-guest
Date: 2009-12-16 07:48:44 + (Wed, 16 Dec 2009)
New Revision: 11295
Modified:
trunk/jetty/debian/build.xml
Log:
Fixed clean to delete some new files.
Modified: trunk/jetty/debian/build.xml
===
--- trunk/jetty/debian/build.xml2009-12-16 07:23:22 UTC (rev 11294)
+++ trunk/jetty/debian/build.xml2009-12-16 07:48:44 UTC (rev 11295)
@@ -132,6 +132,9 @@
fileset dir=${javadoc.dir} excludes=contents.html/
/delete
delete file=${basedir}/start.jar quiet=true/
+delete file=${basedir}/start-daemon.jar quiet=true/
+delete
file=${basedir}/extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.c
quiet=true/
+delete
file=${basedir}/extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.h
quiet=true/
/target
/project
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r11287 - in trunk/jetty/debian: . patches
Author: pabloduboue-guest Date: 2009-12-14 09:24:06 + (Mon, 14 Dec 2009) New Revision: 11287 Added: trunk/jetty/debian/patches/01_add_manifests_with_osgi_bundles_info.patch Modified: trunk/jetty/debian/changelog trunk/jetty/debian/jetty.install trunk/jetty/debian/patches/series Log: * New upstream release. * Added OSGi bundle metadata (by upstream). (Closes: #558187) * Corrected path to jetty web-apps (by Niels Thykier). (Closes: #554877) Modified: trunk/jetty/debian/changelog === --- trunk/jetty/debian/changelog2009-12-14 08:52:36 UTC (rev 11286) +++ trunk/jetty/debian/changelog2009-12-14 09:24:06 UTC (rev 11287) @@ -1,14 +1,11 @@ -jetty (6.1.21-2) UNRELEASED; urgency=low +jetty (6.1.22-1) UNRELEASED; urgency=low - * Imported two patches from Fedora and created one ourselves: -- Fixed problems where jetty could be tricked into writing binary -data to log-files. -- Fixed some javascript injections in the examples. -(Fixes: CVE-2009-3579) - * Corrected path to jetty web-apps. (Closes: #554877) + * New upstream release. + * Added OSGi bundle metadata (by upstream). (Closes: #558187) + * Corrected path to jetty web-apps (by Niels Thykier). (Closes: #554877) - -- Niels Thykier ni...@thykier.net Fri, 27 Nov 2009 20:54:58 +0100 - + -- Pablo Duboue pablo.dub...@gmail.com Sun, 13 Dec 2009 1:55:00 -0400 + jetty (6.1.21-1) unstable; urgency=medium * New upstream release. Modified: trunk/jetty/debian/jetty.install === --- trunk/jetty/debian/jetty.install2009-12-14 08:52:36 UTC (rev 11286) +++ trunk/jetty/debian/jetty.install2009-12-14 09:24:06 UTC (rev 11287) @@ -8,5 +8,5 @@ README.txt usr/share/doc/jetty LICENSES/cla-* usr/share/doc/jetty/LICENSES LICENSES/ccla-* usr/share/doc/jetty/LICENSES -LICENSES/NOTICE.txt usr/share/doc/jetty/LICENSES +NOTICE.txt usr/share/doc/jetty/LICENSES debian/README.Debianusr/share/doc/jetty Added: trunk/jetty/debian/patches/01_add_manifests_with_osgi_bundles_info.patch === --- trunk/jetty/debian/patches/01_add_manifests_with_osgi_bundles_info.patch (rev 0) +++ trunk/jetty/debian/patches/01_add_manifests_with_osgi_bundles_info.patch 2009-12-14 09:24:06 UTC (rev 11287) @@ -0,0 +1,125 @@ +Description: Adds MANIFEST.MF with OSGi Bundle information (needed for Eclipse) +Origin: Upstream. + +diff -Naur ./modules-old/jetty/src/main/resources/META-INF/MANIFEST.MF ./modules/jetty/src/main/resources/META-INF/MANIFEST.MF +--- ./modules-old/jetty/src/main/resources/META-INF/MANIFEST.MF 1970-01-01 00:00:00.0 + ./modules/jetty/src/main/resources/META-INF/MANIFEST.MF2009-12-09 23:54:58.0 + +@@ -0,0 +1,71 @@ ++Manifest-Version: 1.0 ++implementation-version: 6.1.22 ++mode: development ++package: org.mortbay ++url: http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty ++Bundle-License: http://www.apache.org/licenses/LICENSE-2.0, http://www ++ .eclipse.org/org/documents/epl-v10.php ++Import-Package: javax.net.ssl,javax.security.cert,javax.servlet;versio ++ n=2.5,javax.servlet.http;version=2.5,javax.servlet.jsp;resolution ++ :=optional,javax.servlet.resources;resolution:=optional;version=2.5 ++ ,javax.xml.parsers,org.apache.jasper.servlet;resolution:=optional,org ++ .mortbay.component;version=6.1,org.mortbay.jetty.handler.management ++ ;resolution:=optional,org.mortbay.log;version=6.1,org.mortbay.servl ++ et;version=6.1,org.mortbay.thread;version=6.1,org.mortbay.util;ve ++ rsion=6.1,org.mortbay.util.ajax;version=6.1,org.xml.sax,org.xml.s ++ ax.helpers ++Bundle-RequiredExecutionEnvironment: J2SE-1.4 ++Bnd-LastModified: 1259702329236 ++Export-Package: org.mortbay.jetty.bio;uses:=org.mortbay.log,org.mortb ++ ay.thread,org.mortbay.io.bio,org.mortbay.io,org.mortbay.jetty;versio ++ n=6.1.22,org.mortbay.servlet.jetty;uses:=javax.servlet.http,javax. ++ servlet,org.mortbay.servlet,org.mortbay.io,org.mortbay.jetty;version ++ =6.1.22,org.mortbay.jetty.nio;uses:=org.mortbay.log,org.mortbay.th ++ read,org.mortbay.io,org.mortbay.jetty,org.mortbay.util.ajax,org.mortb ++ ay.io.nio;version=6.1.22,org.mortbay.resource;uses:=org.mortbay.l ++ og,org.mortbay.util;version=6.1.22,org.mortbay.io.nio;uses:=org.m ++ ortbay.log,org.mortbay.component,org.mortbay.thread,org.mortbay.io,or ++ g.mortbay.jetty;version=6.1.22,org.mortbay.jetty.security;uses:=o ++ rg.mortbay.util,org.mortbay.component,javax.servlet.http,org.mortbay. ++ jetty.bio,javax.security.cert,org.mortbay.resource,org.mortbay.log,ja ++ vax.servlet,org.mortbay.io.bio,org.mortbay.jetty.servlet,org.mortbay. ++ io,org.mortbay.jetty.handler,org.mortbay.jetty.webapp,org.mortbay.jet ++ ty,javax.net.ssl;version=6.1.22,org.mortbay.jetty.deployer;uses
[pkg-java] r11288 - trunk/jetty/debian/patches
Author: pabloduboue-guest
Date: 2009-12-14 09:26:36 + (Mon, 14 Dec 2009)
New Revision: 11288
Removed:
trunk/jetty/debian/patches/01_CVE_2009_3579.patch
trunk/jetty/debian/patches/02_log_exploit.patch
trunk/jetty/debian/patches/03_jsnoop-vul.patch
Log:
Removed old patches subsumed by new upstream version.
Deleted: trunk/jetty/debian/patches/01_CVE_2009_3579.patch
===
--- trunk/jetty/debian/patches/01_CVE_2009_3579.patch 2009-12-14 09:24:06 UTC
(rev 11287)
+++ trunk/jetty/debian/patches/01_CVE_2009_3579.patch 2009-12-14 09:26:36 UTC
(rev 11288)
@@ -1,41 +0,0 @@
-Description: Fixes CVE-2009-3579.
-Origin: Fedora.
-
-diff -up ./examples/test-webapp/src/main/java/com/acme/CookieDump.java.fix
./examples/test-webapp/src/main/java/com/acme/CookieDump.java
a/examples/test-webapp/src/main/java/com/acme/CookieDump.java
2009-11-03 12:32:01.0 -0500
-+++ b/examples/test-webapp/src/main/java/com/acme/CookieDump.java
2009-11-03 12:33:52.0 -0500
-@@ -26,6 +26,8 @@ import javax.servlet.http.HttpServletReq
- import javax.servlet.http.HttpServletResponse;
- import javax.servlet.http.HttpSession;
-
-+import org.mortbay.util.StringUtil;
-+
-
- /* */
- /** Test Servlet Cookies.
-@@ -89,7 +91,7 @@ public class CookieDump extends HttpServ
-
- for (int i=0;cookies!=null icookies.length;i++)
- {
--
out.println(b+cookies[i].getName()+/b=+cookies[i].getValue()+br/);
-+
out.println(b+deScript(cookies[i].getName())+/b=+deScript(cookies[i].getValue())+br/);
- }
-
- out.println(form action=\+response.encodeURL(getURI(request))+\
method=\post\);
-@@ -114,5 +116,15 @@ public class CookieDump extends HttpServ
- uri=request.getRequestURI();
- return uri;
- }
--
-+
-+/* */
-+protected String deScript(String string)
-+{
-+if (string==null)
-+return null;
-+string=StringUtil.replace(string, , amp;);
-+string=StringUtil.replace(string, , lt;);
-+string=StringUtil.replace(string, , gt;);
-+return string;
-+}
- }
Deleted: trunk/jetty/debian/patches/02_log_exploit.patch
===
--- trunk/jetty/debian/patches/02_log_exploit.patch 2009-12-14 09:24:06 UTC
(rev 11287)
+++ trunk/jetty/debian/patches/02_log_exploit.patch 2009-12-14 09:26:36 UTC
(rev 11288)
@@ -1,324 +0,0 @@
-Description: Prevents jetty from writing binary characters to log-files.
-Origin: Fedora
-
-diff -up
./modules/jetty/src/main/java/org/mortbay/jetty/handler/ErrorHandler.java.fix2
./modules/jetty/src/main/java/org/mortbay/jetty/handler/ErrorHandler.java
a/modules/jetty/src/main/java/org/mortbay/jetty/handler/ErrorHandler.java
2009-11-03 12:45:36.0 -0500
-+++ b/modules/jetty/src/main/java/org/mortbay/jetty/handler/ErrorHandler.java
2009-11-03 12:47:35.0 -0500
-@@ -91,8 +91,7 @@ public class ErrorHandler extends Abstra
- writer.write(titleError );
- writer.write(Integer.toString(code));
- writer.write(' ');
--if (message!=null)
--writer.write(deScript(message));
-+write(writer,message);
- writer.write(/title\n);
- }
-
-@@ -117,9 +116,9 @@ public class ErrorHandler extends Abstra
- writer.write(h2HTTP ERROR );
- writer.write(Integer.toString(code));
- writer.write(/h2\npProblem accessing );
--writer.write(deScript(uri));
-+write(writer,uri);
- writer.write(. Reason:\npre);
--writer.write(deScript(message));
-+write(writer,message);
- writer.write(/pre/p);
- }
-
-@@ -135,7 +134,7 @@ public class ErrorHandler extends Abstra
- PrintWriter pw = new PrintWriter(sw);
- th.printStackTrace(pw);
- pw.flush();
--writer.write(deScript(sw.getBuffer().toString()));
-+write(writer,sw.getBuffer().toString());
- writer.write(/pre\n);
-
- th =th.getCause();
-@@ -162,13 +161,34 @@ public class ErrorHandler extends Abstra
- }
-
- /* */
--protected String deScript(String string)
-+protected void write(Writer writer,String string)
-+throws IOException
- {
- if (string==null)
--return null;
--string=StringUtil.replace(string, , amp;);
--string=StringUtil.replace(string, , lt;);
--string=StringUtil.replace(string, , gt;);
--return string;
-+return;
-+
-+for (int i=0;istring.length();i++)
-+{
-+char c=string.charAt(i);
-+
-+switch(c)
-+{
-+
