rhill 15/03/14 09:39:07
Modified: build.xml vuze-5.3.0.0-remove-classpath.patch
vuze-5.3.0.0-java5.patch
Added: vuze-5.6.0.0-invalid-characters.patch
vuze-5.6.0.0-commons-lang-entities.patch
Removed: vuze-5.3.0.0-cache-size.patch
Log:
Long overdue version bump. Drop cache size patch as requested by Bobby Kent.
Strip DOS line endings from source to stop upstream from breaking our patches
every release.
Signed-off-by: Ryan Hill <rh...@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
957A8463)
Revision Changes Path
1.2 net-p2p/vuze/files/build.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/build.xml?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/build.xml?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/build.xml?r1=1.1&r2=1.2
Index: build.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/vuze/files/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 6 Feb 2009 11:46:34 -0000 1.1
+++ build.xml 14 Mar 2015 09:39:07 -0000 1.2
@@ -1,68 +1,68 @@
-<?xml version="1.0"?>
-
-<!--
-
-NOTE: You may need to set the ANT_OPTS="-Xmx512m" env prop in order to
compile this project successfully.
-
--->
-
-
-<project default="jar" name="Azureus" basedir=".">
-
- <property name="root.dir" value="." /> <!-- REMINDER: this needs to be "."
for public source -->
- <property name="libs.dir" value="build/libs" />
- <property name="dist.dir" value="dist" />
-
- <property name="generic.excludes" value="**/*.jar **/*.txt **/*.jardesc
**/.classpath **/.project **/aereg.lib **/aereg.dll" />
- <property name="dist.jar.excludes" value="${generic.excludes} **/*.java " />
- <!-- <property name="dist.source.excludes" value="${generic.excludes}
**/*.class" /> -->
-
-
- <target name="init" >
- <echo message="Building Azureus2.jar..." />
-
- <tstamp/>
-
- <!-- <condition property="libs.dir" value="build/libs">
- <not> <isset property="libs.dir" /> </not>
- </condition> -->
-
- <mkdir dir="${root.dir}/${dist.dir}" />
- </target>
-
-
- <target name="compile" depends="init" >
- <path id="libs.classpath">
- <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
- </path>
-
- <javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes"
source="1.4" target="1.4" includeAntRuntime="no" debug="true"
debuglevel="lines,vars,source" >
- <classpath refid="libs.classpath" />
- </javac>
- </target>
-
-
- <target name="jar" depends="compile" >
- <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar"
basedir="${root.dir}" excludes="${dist.jar.excludes}" >
- <manifest>
- <attribute name="Main-Class"
value="org.gudy.azureus2.ui.common.Main" />
- <attribute name="Class-Path" value="Azureus2.jar
apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar
swt-osx.jar" />
- </manifest>
- </jar>
-
- <!-- <zip destfile="${dist.dir}/Azureus2_source.zip" basedir="."
excludes="${dist.source.excludes}" /> -->
-
- </target>
-
-
- <target name="clean" >
- <delete quiet="true" >
- <fileset dir="${root.dir}/com" includes="**/*.class"/>
- <fileset dir="${root.dir}/org" includes="**/*.class"/>
- </delete>
-
- <delete dir="${root.dir}/${dist.dir}" />
- </target>
-
-</project>
-
+<?xml version="1.0"?>
+
+<!--
+
+NOTE: You may need to set the ANT_OPTS="-Xmx512m" env prop in order to
compile this project successfully.
+
+-->
+
+
+<project default="jar" name="Azureus" basedir=".">
+
+ <property name="root.dir" value="." /> <!-- REMINDER: this needs to be "."
for public source -->
+ <property name="libs.dir" value="build/libs" />
+ <property name="dist.dir" value="dist" />
+
+ <property name="generic.excludes" value="**/*.jar **/*.txt **/*.jardesc
**/.classpath **/.project **/aereg.lib **/aereg.dll" />
+ <property name="dist.jar.excludes" value="${generic.excludes} **/*.java " />
+ <!-- <property name="dist.source.excludes" value="${generic.excludes}
**/*.class" /> -->
+
+
+ <target name="init" >
+ <echo message="Building Azureus2.jar..." />
+
+ <tstamp/>
+
+ <!-- <condition property="libs.dir" value="build/libs">
+ <not> <isset property="libs.dir" /> </not>
+ </condition> -->
+
+ <mkdir dir="${root.dir}/${dist.dir}" />
+ </target>
+
+
+ <target name="compile" depends="init" >
+ <path id="libs.classpath">
+ <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
+ </path>
+
+ <javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes"
source="1.4" target="1.4" includeAntRuntime="no" debug="true"
debuglevel="lines,vars,source" >
+ <classpath refid="libs.classpath" />
+ </javac>
+ </target>
+
+
+ <target name="jar" depends="compile" >
+ <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar"
basedir="${root.dir}" excludes="${dist.jar.excludes}" >
+ <manifest>
+ <attribute name="Main-Class"
value="org.gudy.azureus2.ui.common.Main" />
+ <attribute name="Class-Path" value="Azureus2.jar
apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar
swt-osx.jar" />
+ </manifest>
+ </jar>
+
+ <!-- <zip destfile="${dist.dir}/Azureus2_source.zip" basedir="."
excludes="${dist.source.excludes}" /> -->
+
+ </target>
+
+
+ <target name="clean" >
+ <delete quiet="true" >
+ <fileset dir="${root.dir}/com" includes="**/*.class"/>
+ <fileset dir="${root.dir}/org" includes="**/*.class"/>
+ </delete>
+
+ <delete dir="${root.dir}/${dist.dir}" />
+ </target>
+
+</project>
+
1.2 net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch?r1=1.1&r2=1.2
Index: vuze-5.3.0.0-remove-classpath.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vuze-5.3.0.0-remove-classpath.patch 9 Mar 2014 07:38:47 -0000 1.1
+++ vuze-5.3.0.0-remove-classpath.patch 14 Mar 2015 09:39:07 -0000 1.2
@@ -1,10 +1,10 @@
--- a/build.xml
+++ b/build.xml
@@ -46,7 +46,6 @@ NOTE: You may need to set the ANT_OPTS="-Xmx512m" env
prop in order to compil
- <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar"
basedir="${root.dir}" excludes="${dist.jar.excludes}" >
- <manifest>
- <attribute name="Main-Class"
value="org.gudy.azureus2.ui.common.Main" />
-- <attribute name="Class-Path" value="Azureus2.jar
apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar
swt-osx.jar" />
- </manifest>
- </jar>
-
+ <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar"
basedir="${root.dir}" excludes="${dist.jar.excludes}" >
+ <manifest>
+ <attribute name="Main-Class"
value="org.gudy.azureus2.ui.common.Main" />
+- <attribute name="Class-Path" value="Azureus2.jar
apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar
swt-osx.jar" />
+ </manifest>
+ </jar>
+
1.2 net-p2p/vuze/files/vuze-5.3.0.0-java5.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch?r1=1.1&r2=1.2
Index: vuze-5.3.0.0-java5.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vuze-5.3.0.0-java5.patch 9 Mar 2014 07:38:47 -0000 1.1
+++ vuze-5.3.0.0-java5.patch 14 Mar 2015 09:39:07 -0000 1.2
@@ -1,11 +1,11 @@
--- a/build.xml
+++ b/build.xml
@@ -36,7 +36,7 @@ NOTE: You may need to set the ANT_OPTS="-Xmx512m" env
prop in order to compil
- <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
- </path>
-
-- <javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes"
source="1.4" target="1.4" includeAntRuntime="no" debug="true"
debuglevel="lines,vars,source" >
-+ <javac encoding="8859_1" srcdir="${root.dir}" destdir="${root.dir}"
nowarn="yes" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source"
>
- <classpath refid="libs.classpath" />
- </javac>
- </target>
+ <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
+ </path>
+
+- <javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes"
source="1.4" target="1.4" includeAntRuntime="no" debug="true"
debuglevel="lines,vars,source" >
++ <javac encoding="8859_1" srcdir="${root.dir}" destdir="${root.dir}"
nowarn="yes" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source"
>
+ <classpath refid="libs.classpath" />
+ </javac>
+ </target>
1.1 net-p2p/vuze/files/vuze-5.6.0.0-invalid-characters.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/vuze-5.6.0.0-invalid-characters.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/vuze-5.6.0.0-invalid-characters.patch?rev=1.1&content-type=text/plain
Index: vuze-5.6.0.0-invalid-characters.patch
===================================================================
diff --git a/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java
b/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java
index 34e898c..2e5bcaa 100644
--- a/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java
+++ b/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java
@@ -49,17 +49,17 @@ public class DateParserRegex extends DateParser {
private static final String[] MONTHS_LIST = new String[] {
" january janvier enero januar",
- " february fevrier f�vrier febrero februar",
- " march mars marzo marz marz m�rz" ,
+ " february fevrier febrero februar",
+ " march mars marzo marz marz",
" april avril abril april ",
" may mai mayo mai",
" june juin junio juni",
" july juillet julio juli",
- " august aout ao�t agosto august",
+ " august aout agosto august",
" september septembre septiembre september",
" october octobre octubre oktober",
" november novembre noviembre november",
- " december decembre d�cembre diciembre dezember"};
+ " december decembre diciembre dezember"};
public DateParserRegex() {
this("GMT-7",true,null);
1.1 net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch?rev=1.1&content-type=text/plain
Index: vuze-5.6.0.0-commons-lang-entities.patch
===================================================================
diff --git a/org/gudy/azureus2/core3/util/AddressUtils.java
b/org/gudy/azureus2/core3/util/AddressUtils.java
index 6691951..38f14ee 100644
--- a/org/gudy/azureus2/core3/util/AddressUtils.java
+++ b/org/gudy/azureus2/core3/util/AddressUtils.java
@@ -494,11 +494,11 @@ AddressUtils
try{
// unfortunately we have an
incompatible base64 standard in i2p, they replaced / with ~ and + with -
- char[] encoded = to_decode.toCharArray();
+ byte[] encoded = to_decode.getBytes();
for ( int i=0;i<encoded.length;i++){
- char c = encoded[i];
+ byte c = encoded[i];
if ( c == '~' ){
encoded[i] = '/';
diff --git
a/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
b/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
index a67a8a2..da4a46c 100644
---
a/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
+++
b/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
@@ -25,7 +25,7 @@ package
org.gudy.azureus2.pluginsimpl.local.utils.xml.simpleparser;
import javax.xml.parsers.*;
import org.xml.sax.*;
-import org.apache.commons.lang.Entities;
+import org.apache.commons.lang.StringEscapeUtils;
import org.gudy.azureus2.core3.util.AENetworkClassifier;
import org.gudy.azureus2.core3.util.Constants;
import org.gudy.azureus2.core3.util.Debug;
@@ -656,17 +656,8 @@ SimpleXMLParserDocumentImpl
replacement = new
String( buffer, 0, buffer_pos );
}else{
-
- int num =
Entities.HTML40.entityValue( ref );
-
- if ( num != -1 ){
-
- replacement =
"&#" + num + ";";
-
- }else{
-
- replacement =
new String( buffer, 0, buffer_pos );
- }
+
+ replacement =
StringEscapeUtils.escapeHtml(ref);
}
char[] chars =
replacement.toCharArray();
