[azureus] 07/13: Refresh patches
Stephen Nelson
stephenonelson-guest at moszumanska.debian.org
Wed Aug 12 23:23:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
stephenonelson-guest pushed a commit to branch master
in repository azureus.
commit 801f1072888b89441155ea82b5bae87299d8006e
Author: Stephen Nelson <stephen at eccostudio.com>
Date: Fri Jul 31 21:22:07 2015 +0100
Refresh patches
---
debian/patches/01_amend_build_classpath.patch | 4 +-
debian/patches/02_speedtest.patch | 6 +-
debian/patches/03_update_disable.patch | 6 +-
debian/patches/04_unbundle_json.patch | 8 +-
debian/patches/05_unbundle_commons_lang.patch | 230 ++++++++++++-------------
debian/patches/06_unbundle_bouncy_castle.patch | 26 +--
debian/patches/07_platform.patch | 12 +-
debian/patches/08_multi_user.patch | 8 +-
debian/patches/09_no_auto_update.patch | 16 +-
debian/patches/series | 4 +-
10 files changed, 158 insertions(+), 162 deletions(-)
diff --git a/debian/patches/01_amend_build_classpath.patch b/debian/patches/01_amend_build_classpath.patch
index e0a1dec..27f6a57 100644
--- a/debian/patches/01_amend_build_classpath.patch
+++ b/debian/patches/01_amend_build_classpath.patch
@@ -30,8 +30,8 @@
</copy>
<!-- Compile source code -->
-- <javac encoding="8859_1" includeAntRuntime="no" debug="true" debuglevel="source,lines,vars" destdir="${build.dir}" source="1.5" target="1.5" fork="yes" memoryMaximumSize="256m" >
-+ <javac encoding="8859_1" includeAntRuntime="no" debug="true" debuglevel="source,lines,vars" destdir="${build.dir}" source="1.6" target="1.6" fork="yes" memoryMaximumSize="256m" >
+- <javac encoding="8859_1" includeAntRuntime="no" debug="true" debuglevel="source,lines,vars" destdir="${build.dir}" source="1.5" target="1.5" fork="yes" memoryMaximumSize="1024m" >
++ <javac encoding="8859_1" includeAntRuntime="no" debug="true" debuglevel="source,lines,vars" destdir="${build.dir}" source="1.6" target="1.6" fork="yes" memoryMaximumSize="1024m" >
<src path="${azureus2.dir}/src"/>
<src path="${azureus3.dir}/src"/>
<src path="${uis.dir}/src"/>
diff --git a/debian/patches/02_speedtest.patch b/debian/patches/02_speedtest.patch
index a40ca6d..3284859 100644
--- a/debian/patches/02_speedtest.patch
+++ b/debian/patches/02_speedtest.patch
@@ -7,11 +7,9 @@
.../NetworkAdminSpeedTestScheduledTestImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
-diff --git a/azureus2/src/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminSpeedTestScheduledTestImpl.java b/azureus2/src/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminSpeedTestScheduledTestImpl.java
-index 01022eb..76e27df 100644
--- a/azureus2/src/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminSpeedTestScheduledTestImpl.java
+++ b/azureus2/src/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminSpeedTestScheduledTestImpl.java
-@@ -461,20 +461,22 @@ NetworkAdminSpeedTestScheduledTestImpl
+@@ -458,20 +458,22 @@
if( size==null || offset==null )
throw new IllegalStateException("scheduleTestWithSpeedTestService had a null parameter.");
@@ -37,5 +35,3 @@ index 01022eb..76e27df 100644
retVal = sendRequest( request );
---
-tg: (7f589b9..) debian/speedtest (depends on: upstream)
diff --git a/debian/patches/03_update_disable.patch b/debian/patches/03_update_disable.patch
index 8584eb4..2ecbf85 100644
--- a/debian/patches/03_update_disable.patch
+++ b/debian/patches/03_update_disable.patch
@@ -12,7 +12,7 @@
--- a/azureus3/src/com/aelitis/azureus/ui/swt/Initializer.java
+++ b/azureus3/src/com/aelitis/azureus/ui/swt/Initializer.java
-@@ -49,9 +49,10 @@
+@@ -45,9 +45,10 @@
import org.gudy.azureus2.ui.swt.pluginsinstaller.InstallPluginWizard;
import org.gudy.azureus2.ui.swt.progress.ProgressWindow;
import org.gudy.azureus2.ui.swt.update.UpdateMonitor;
@@ -43,7 +43,7 @@
//Tell listeners that all is initialized :
--- a/azureus2/src/org/gudy/azureus2/update/CorePatchChecker.java
+++ b/azureus2/src/org/gudy/azureus2/update/CorePatchChecker.java
-@@ -68,7 +68,11 @@
+@@ -65,7 +65,11 @@
System.out.println( "CorePatchChecker: TESTING !!!!" );
}
@@ -58,7 +58,7 @@
--- a/azureus2/src/org/gudy/azureus2/update/CoreUpdateChecker.java
+++ b/azureus2/src/org/gudy/azureus2/update/CoreUpdateChecker.java
-@@ -131,8 +131,11 @@
+@@ -128,8 +128,11 @@
props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
diff --git a/debian/patches/04_unbundle_json.patch b/debian/patches/04_unbundle_json.patch
index c670985..921cea1 100644
--- a/debian/patches/04_unbundle_json.patch
+++ b/debian/patches/04_unbundle_json.patch
@@ -5,7 +5,7 @@
# Last-Update: 2014-06-23
--- a/azureus2/src/com/aelitis/azureus/util/JSONUtils.java
+++ b/azureus2/src/com/aelitis/azureus/util/JSONUtils.java
-@@ -74,7 +74,7 @@
+@@ -71,7 +71,7 @@
* @since 3.0.1.5
*/
public static JSONObject encodeToJSONObject(Map map) {
@@ -14,7 +14,7 @@
for (Map.Entry<String, Object> entry: ((Map<String,Object>)map).entrySet()){
String key = entry.getKey();
-@@ -105,9 +105,7 @@
+@@ -102,9 +102,7 @@
*/
public static String encodeToJSON(Map map) {
JSONObject jobj = encodeToJSONObject(map);
@@ -25,7 +25,7 @@
}
public static String encodeToJSON(Collection list) {
-@@ -138,7 +136,7 @@
+@@ -135,7 +133,7 @@
* @since 3.0.1.5
*/
private static JSONArray encodeToJSONArray(Collection list) {
@@ -36,7 +36,7 @@
--- a/azureus3/src/com/aelitis/azureus/util/ImportExportUtils.java
+++ b/azureus3/src/com/aelitis/azureus/util/ImportExportUtils.java
-@@ -360,7 +360,7 @@
+@@ -378,7 +378,7 @@
throws IOException
{
diff --git a/debian/patches/05_unbundle_commons_lang.patch b/debian/patches/05_unbundle_commons_lang.patch
index 6150a40..e046c29 100644
--- a/debian/patches/05_unbundle_commons_lang.patch
+++ b/debian/patches/05_unbundle_commons_lang.patch
@@ -6,123 +6,123 @@
# Last-Update: 2014-06-23
--- a/azureus3/src/com/aelitis/azureus/core/metasearch/Result.java
+++ b/azureus3/src/com/aelitis/azureus/core/metasearch/Result.java
-@@ -27,7 +27,7 @@
- import java.util.Map;
- import java.util.Random;
-
--import org.apache.commons.lang.Entities;
-+import org.apache.commons.lang3.StringEscapeUtils;
- import org.gudy.azureus2.core3.util.DisplayFormatters;
- import org.json.simple.JSONObject;
-
-@@ -372,6 +372,6 @@
- if ( input == null ){
- return( null );
- }
-- return( Entities.HTML40.unescape( input ));
-+ return( StringEscapeUtils.unescapeHtml4( input ));
- }
- }
+@@ -26,7 +26,7 @@
+ import java.util.Map;
+ import java.util.Random;
+
+-import org.apache.commons.lang.Entities;
++import org.apache.commons.lang3.StringEscapeUtils;
+ import org.gudy.azureus2.core3.util.DisplayFormatters;
+ import org.json.simple.JSONObject;
+
+@@ -377,6 +377,6 @@
+ if ( input == null ){
+ return( null );
+ }
+- return( Entities.HTML40.unescape( input ));
++ return( StringEscapeUtils.unescapeHtml4( input ));
+ }
+ }
--- a/azureus3/src/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
+++ b/azureus3/src/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-@@ -23,7 +23,7 @@
- import java.util.Date;
- import java.util.StringTokenizer;
-
--import org.apache.commons.lang.*;
-+import org.apache.commons.lang3.*;
- import org.gudy.azureus2.core3.util.Base32;
- import org.gudy.azureus2.core3.util.ByteFormatter;
- import org.gudy.azureus2.core3.util.Debug;
-@@ -88,14 +88,14 @@
- public void setNameFromHTML(String name) {
- if(name != null) {
- name = removeHTMLTags(name);
-- this.name = Entities.HTML40.unescape(name);
-+ this.name = StringEscapeUtils.unescapeHtml4(name);
- }
- }
-
- public void setCommentsFromHTML(String comments) {
- if(comments != null) {
- comments = removeHTMLTags(comments);
-- comments = Entities.HTML40.unescape(comments);
-+ comments = StringEscapeUtils.unescapeHtml4(comments);
- comments = comments.replaceAll(",", "");
- comments = comments.replaceAll(" ", "");
- try{
-@@ -108,7 +108,7 @@
- public void setCategoryFromHTML(String category) {
- if(category != null) {
- category = removeHTMLTags(category);
-- this.category = Entities.HTML40.unescape(category).trim();
-+ this.category = StringEscapeUtils.unescapeHtml4(category).trim();
- /*int separator = this.category.indexOf(">");
-
- if(separator != -1) {
-@@ -133,7 +133,7 @@
- public void setNbPeersFromHTML(String nbPeers) {
- if(nbPeers != null) {
- nbPeers = removeHTMLTags(nbPeers);
-- String nbPeersS = Entities.HTML40.unescape(nbPeers);
-+ String nbPeersS = StringEscapeUtils.unescapeHtml4(nbPeers);
- nbPeersS = nbPeersS.replaceAll(",", "");
- nbPeersS = nbPeersS.replaceAll(" ", "");
- try {
-@@ -148,7 +148,7 @@
- public void setNbSeedsFromHTML(String nbSeeds) {
- if(nbSeeds != null) {
- nbSeeds = removeHTMLTags(nbSeeds);
-- String nbSeedsS = Entities.HTML40.unescape(nbSeeds);
-+ String nbSeedsS = StringEscapeUtils.unescapeHtml4(nbSeeds);
- nbSeedsS = nbSeedsS.replaceAll(",", "");
- nbSeedsS = nbSeedsS.replaceAll(" ", "");
- try {
-@@ -163,7 +163,7 @@
- public void setNbSuperSeedsFromHTML(String nbSuperSeeds) {
- if(nbSuperSeeds != null) {
- nbSuperSeeds = removeHTMLTags(nbSuperSeeds);
-- String nbSuperSeedsS = Entities.HTML40.unescape(nbSuperSeeds);
-+ String nbSuperSeedsS = StringEscapeUtils.unescapeHtml4(nbSuperSeeds);
- nbSuperSeedsS = nbSuperSeedsS.replaceAll(",", "");
- nbSuperSeedsS = nbSuperSeedsS.replaceAll(" ", "");
- try {
-@@ -230,7 +230,7 @@
- public void setPublishedDateFromHTML(String publishedDate) {
- if(publishedDate != null) {
- publishedDate = removeHTMLTags(publishedDate);
-- String publishedDateS = Entities.HTML40.unescape(publishedDate).replace((char)160,(char)32);
-+ String publishedDateS = StringEscapeUtils.unescapeHtml4(publishedDate).replace((char)160,(char)32);
- this.publishedDate = dateParser.parseDate(publishedDateS);
- }
- }
-@@ -239,7 +239,7 @@
- public void setSizeFromHTML(String size) {
- if(size != null) {
- size = removeHTMLTags(size);
-- String sizeS = Entities.HTML40.unescape(size).replace((char)160,(char)32);
-+ String sizeS = StringEscapeUtils.unescapeHtml4(size).replace((char)160,(char)32);
- sizeS = sizeS.replaceAll("<[^>]+>", " ");
- //Add a space between the digits and unit if there is none
- sizeS = sizeS.replaceFirst("(\\d)([a-zA-Z])", "$1 $2");
-@@ -285,7 +285,7 @@
- public void setVotesFromHTML(String votes_str) {
- if(votes_str != null) {
- votes_str = removeHTMLTags(votes_str);
-- votes_str = Entities.HTML40.unescape(votes_str);
-+ votes_str = StringEscapeUtils.unescapeHtml4(votes_str);
- votes_str = votes_str.replaceAll(",", "");
- votes_str = votes_str.replaceAll(" ", "");
- try {
-@@ -299,7 +299,7 @@
- public void setVotesDownFromHTML(String votes_str) {
- if(votes_str != null) {
- votes_str = removeHTMLTags(votes_str);
-- votes_str = Entities.HTML40.unescape(votes_str);
-+ votes_str = StringEscapeUtils.unescapeHtml4(votes_str);
- votes_str = votes_str.replaceAll(",", "");
- votes_str = votes_str.replaceAll(" ", "");
- try {
+@@ -22,7 +22,7 @@
+ import java.util.Date;
+ import java.util.StringTokenizer;
+
+-import org.apache.commons.lang.*;
++import org.apache.commons.lang3.*;
+ import org.gudy.azureus2.core3.util.Base32;
+ import org.gudy.azureus2.core3.util.ByteFormatter;
+ import org.gudy.azureus2.core3.util.Debug;
+@@ -87,14 +87,14 @@
+ public void setNameFromHTML(String name) {
+ if(name != null) {
+ name = removeHTMLTags(name);
+- this.name = Entities.HTML40.unescape(name);
++ this.name = StringEscapeUtils.unescapeHtml4(name);
+ }
+ }
+
+ public void setCommentsFromHTML(String comments) {
+ if(comments != null) {
+ comments = removeHTMLTags(comments);
+- comments = Entities.HTML40.unescape(comments);
++ comments = StringEscapeUtils.unescapeHtml4(comments);
+ comments = comments.replaceAll(",", "");
+ comments = comments.replaceAll(" ", "");
+ try{
+@@ -107,7 +107,7 @@
+ public void setCategoryFromHTML(String category) {
+ if(category != null) {
+ category = removeHTMLTags(category);
+- this.category = Entities.HTML40.unescape(category).trim();
++ this.category = StringEscapeUtils.unescapeHtml4(category).trim();
+ /*int separator = this.category.indexOf(">");
+
+ if(separator != -1) {
+@@ -132,7 +132,7 @@
+ public void setNbPeersFromHTML(String nbPeers) {
+ if(nbPeers != null) {
+ nbPeers = removeHTMLTags(nbPeers);
+- String nbPeersS = Entities.HTML40.unescape(nbPeers);
++ String nbPeersS = StringEscapeUtils.unescapeHtml4(nbPeers);
+ nbPeersS = nbPeersS.replaceAll(",", "");
+ nbPeersS = nbPeersS.replaceAll(" ", "");
+ try {
+@@ -147,7 +147,7 @@
+ public void setNbSeedsFromHTML(String nbSeeds) {
+ if(nbSeeds != null) {
+ nbSeeds = removeHTMLTags(nbSeeds);
+- String nbSeedsS = Entities.HTML40.unescape(nbSeeds);
++ String nbSeedsS = StringEscapeUtils.unescapeHtml4(nbSeeds);
+ nbSeedsS = nbSeedsS.replaceAll(",", "");
+ nbSeedsS = nbSeedsS.replaceAll(" ", "");
+ try {
+@@ -162,7 +162,7 @@
+ public void setNbSuperSeedsFromHTML(String nbSuperSeeds) {
+ if(nbSuperSeeds != null) {
+ nbSuperSeeds = removeHTMLTags(nbSuperSeeds);
+- String nbSuperSeedsS = Entities.HTML40.unescape(nbSuperSeeds);
++ String nbSuperSeedsS = StringEscapeUtils.unescapeHtml4(nbSuperSeeds);
+ nbSuperSeedsS = nbSuperSeedsS.replaceAll(",", "");
+ nbSuperSeedsS = nbSuperSeedsS.replaceAll(" ", "");
+ try {
+@@ -229,7 +229,7 @@
+ public void setPublishedDateFromHTML(String publishedDate) {
+ if(publishedDate != null) {
+ publishedDate = removeHTMLTags(publishedDate);
+- String publishedDateS = Entities.HTML40.unescape(publishedDate).replace((char)160,(char)32);
++ String publishedDateS = StringEscapeUtils.unescapeHtml4(publishedDate).replace((char)160,(char)32);
+ this.publishedDate = dateParser.parseDate(publishedDateS);
+ }
+ }
+@@ -238,7 +238,7 @@
+ public void setSizeFromHTML(String size) {
+ if(size != null) {
+ size = removeHTMLTags(size);
+- String sizeS = Entities.HTML40.unescape(size).replace((char)160,(char)32);
++ String sizeS = StringEscapeUtils.unescapeHtml4(size).replace((char)160,(char)32);
+ sizeS = sizeS.replaceAll("<[^>]+>", " ");
+ //Add a space between the digits and unit if there is none
+ sizeS = sizeS.replaceFirst("(\\d)([a-zA-Z])", "$1 $2");
+@@ -284,7 +284,7 @@
+ public void setVotesFromHTML(String votes_str) {
+ if(votes_str != null) {
+ votes_str = removeHTMLTags(votes_str);
+- votes_str = Entities.HTML40.unescape(votes_str);
++ votes_str = StringEscapeUtils.unescapeHtml4(votes_str);
+ votes_str = votes_str.replaceAll(",", "");
+ votes_str = votes_str.replaceAll(" ", "");
+ try {
+@@ -298,7 +298,7 @@
+ public void setVotesDownFromHTML(String votes_str) {
+ if(votes_str != null) {
+ votes_str = removeHTMLTags(votes_str);
+- votes_str = Entities.HTML40.unescape(votes_str);
++ votes_str = StringEscapeUtils.unescapeHtml4(votes_str);
+ votes_str = votes_str.replaceAll(",", "");
+ votes_str = votes_str.replaceAll(" ", "");
+ try {
--- a/build.xml
+++ b/build.xml
@@ -32,7 +32,7 @@
diff --git a/debian/patches/06_unbundle_bouncy_castle.patch b/debian/patches/06_unbundle_bouncy_castle.patch
index 0a9ca74..f76921e 100644
--- a/debian/patches/06_unbundle_bouncy_castle.patch
+++ b/debian/patches/06_unbundle_bouncy_castle.patch
@@ -1,6 +1,6 @@
--- a/azureus2/src/com/aelitis/azureus/core/security/impl/CryptoSTSEngineImpl.java
+++ b/azureus2/src/com/aelitis/azureus/core/security/impl/CryptoSTSEngineImpl.java
-@@ -30,10 +30,12 @@
+@@ -27,10 +27,12 @@
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.SecureRandom;
@@ -14,7 +14,7 @@
import com.aelitis.azureus.core.security.CryptoECCUtils;
import com.aelitis.azureus.core.security.CryptoManagerException;
-@@ -56,9 +58,9 @@
+@@ -53,9 +55,9 @@
private PrivateKey myPrivateKey;
private PublicKey remotePubKey;
private byte[] sharedSecret;
@@ -27,7 +27,7 @@
/**
*
* @param myIdent keypair representing our current identity
-@@ -76,10 +78,8 @@
+@@ -73,10 +75,8 @@
ephemeralKeyPair = CryptoECCUtils.createKeys();
try{
@@ -40,7 +40,7 @@
ecDH.init(ephemeralKeyPair.getPrivate());
}catch (Exception e){
-@@ -402,38 +402,5 @@
+@@ -399,38 +399,5 @@
throw( new CryptoManagerException( "Failed to put byte[]", e ));
}
}
@@ -83,7 +83,7 @@
\ No newline at end of file
--- a/azureus2/src/org/gudy/azureus2/core3/security/impl/SESecurityManagerBC.java
+++ b/azureus2/src/org/gudy/azureus2/core3/security/impl/SESecurityManagerBC.java
-@@ -39,6 +39,7 @@
+@@ -36,6 +36,7 @@
import org.bouncycastle.jce.*;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.asn1.x509.X509Name;
@@ -104,7 +104,7 @@
<fileset dir="${uis.dir}/lib" includes="*.jar" />-->
--- a/azureus2/src/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java
+++ b/azureus2/src/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java
-@@ -36,7 +36,6 @@
+@@ -33,7 +33,6 @@
import org.bouncycastle.crypto.encodings.PKCS1Encoding;
import org.bouncycastle.crypto.engines.RSAEngine;
import org.bouncycastle.crypto.params.ParametersWithRandom;
@@ -112,7 +112,7 @@
import org.gudy.azureus2.core3.util.Debug;
import org.gudy.azureus2.core3.util.RandomUtils;
import org.gudy.azureus2.plugins.utils.StaticUtilities;
-@@ -83,29 +82,11 @@
+@@ -80,29 +79,11 @@
byte[] secret_bytes = session_key.getEncoded();
@@ -144,7 +144,7 @@
--- a/azureus2/src/com/aelitis/azureus/core/security/impl/CryptoHandlerECC.java
+++ b/azureus2/src/com/aelitis/azureus/core/security/impl/CryptoHandlerECC.java
-@@ -29,6 +29,7 @@
+@@ -26,6 +26,7 @@
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.SecureRandom;
@@ -152,7 +152,7 @@
import java.security.Signature;
import java.security.spec.AlgorithmParameterSpec;
import java.util.Arrays;
-@@ -37,7 +38,7 @@
+@@ -34,7 +35,7 @@
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
@@ -161,7 +161,7 @@
import org.bouncycastle.jce.spec.IEKeySpec;
import org.bouncycastle.jce.spec.IESParameterSpec;
import org.gudy.azureus2.core3.config.COConfigurationManager;
-@@ -79,6 +80,7 @@
+@@ -76,6 +77,7 @@
CryptoManagerImpl _manager,
int _instance_id )
{
@@ -169,7 +169,7 @@
manager = _manager;
CONFIG_PREFIX += _instance_id + ".";
-@@ -225,11 +227,11 @@
+@@ -222,11 +224,11 @@
IESParameterSpec param = new IESParameterSpec( d, e, 128);
@@ -184,7 +184,7 @@
byte[] result = new byte[32+encrypted.length];
-@@ -267,12 +269,9 @@
+@@ -264,12 +266,9 @@
System.arraycopy( data, 16, e, 0, 16 );
IESParameterSpec param = new IESParameterSpec( d, e, 128);
@@ -200,7 +200,7 @@
}catch( CryptoManagerException e ){
-@@ -859,33 +858,5 @@
+@@ -866,33 +865,5 @@
{
return((int)COConfigurationManager.getIntParameter( CONFIG_PREFIX + "pwtype", CryptoManagerPasswordHandler.HANDLER_TYPE_USER ));
}
diff --git a/debian/patches/07_platform.patch b/debian/patches/07_platform.patch
index 4c162cc..19c50ce 100644
--- a/debian/patches/07_platform.patch
+++ b/debian/patches/07_platform.patch
@@ -4,7 +4,7 @@
# Last-Update: 2014-06-23
--- a/azureus2/src/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
+++ b/azureus2/src/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
-@@ -30,8 +30,10 @@
+@@ -27,8 +27,10 @@
import org.gudy.azureus2.platform.PlatformManager;
import org.gudy.azureus2.platform.PlatformManagerFactory;
import org.gudy.azureus2.platform.unix.ScriptAfterShutdown;
@@ -15,7 +15,7 @@
import org.gudy.azureus2.plugins.PluginInterface;
import org.gudy.azureus2.plugins.platform.PlatformManagerException;
import org.gudy.azureus2.pluginsimpl.local.PluginInitializer;
-@@ -317,7 +319,8 @@
+@@ -314,7 +316,8 @@
}
try {
@@ -25,7 +25,7 @@
AEWin32Access accessor = AEWin32Manager.getAccessor(true);
if (accessor == null) {
result = -123;
-@@ -372,6 +375,7 @@
+@@ -369,6 +372,7 @@
SystemProperties.getApplicationPath(), AEWin32Access.SW_NORMAL);
}
}
@@ -35,7 +35,7 @@
* Some results:
--- a/azureus2/src/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java
+++ b/azureus2/src/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java
-@@ -24,6 +24,10 @@
+@@ -21,6 +21,10 @@
import org.gudy.azureus2.platform.unix.PlatformManagerUnixPlugin;
@@ -46,7 +46,7 @@
import org.gudy.azureus2.plugins.Plugin;
import org.gudy.azureus2.plugins.PluginException;
import org.gudy.azureus2.plugins.PluginInterface;
-@@ -54,16 +58,21 @@
+@@ -51,16 +55,21 @@
PlatformManager platform = PlatformManagerFactory.getPlatformManager();
int platformType = platform.getPlatformType();
@@ -73,7 +73,7 @@
pluginProperties.setProperty("plugin.version", "1.0");
--- a/azureus2/src/org/gudy/azureus2/platform/PlatformManagerFactory.java
+++ b/azureus2/src/org/gudy/azureus2/platform/PlatformManagerFactory.java
-@@ -58,10 +58,6 @@
+@@ -55,10 +55,6 @@
if ( getPlatformType() == PlatformManager.PT_WINDOWS ){
platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
diff --git a/debian/patches/08_multi_user.patch b/debian/patches/08_multi_user.patch
index 9581a1c..c46263b 100644
--- a/debian/patches/08_multi_user.patch
+++ b/debian/patches/08_multi_user.patch
@@ -139,7 +139,7 @@
+}
--- a/azureus2/src/org/gudy/azureus2/core3/util/RandomUtils.java
+++ b/azureus2/src/org/gudy/azureus2/core3/util/RandomUtils.java
-@@ -80,7 +80,7 @@
+@@ -77,7 +77,7 @@
public static final int LISTEN_PORT_MIN = 10000;
@@ -150,7 +150,7 @@
/**
--- a/azureus2/src/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionConnection.java
+++ b/azureus2/src/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionConnection.java
-@@ -128,7 +128,7 @@
+@@ -127,7 +127,7 @@
label.setLayoutData(gridData);
final IntParameter udp_listen = new IntParameter(cMiniArea,
@@ -161,7 +161,7 @@
--- a/azureus2/src/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionConnectionAdvanced.java
+++ b/azureus2/src/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionConnectionAdvanced.java
-@@ -190,7 +190,7 @@
+@@ -188,7 +188,7 @@
Label lpbind = new Label(gSocket, SWT.NULL);
Messages.setLanguageText(lpbind, CFG_PREFIX + "bind_port");
final IntParameter port_bind = new IntParameter(gSocket,
@@ -172,7 +172,7 @@
port_bind.setLayoutData(gridData);
--- a/azureus2/src/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionTrackerClient.java
+++ b/azureus2/src/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionTrackerClient.java
-@@ -220,7 +220,7 @@
+@@ -218,7 +218,7 @@
try
{
int portVal = Integer.parseInt(toValue);
diff --git a/debian/patches/09_no_auto_update.patch b/debian/patches/09_no_auto_update.patch
index 00c4eb7..4e9e8a0 100644
--- a/debian/patches/09_no_auto_update.patch
+++ b/debian/patches/09_no_auto_update.patch
@@ -5,10 +5,10 @@
# Last-Update: 2014-06-23
--- a/azureus2/src/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java
+++ b/azureus2/src/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java
-@@ -276,9 +276,9 @@
-
+@@ -277,9 +277,9 @@
def.put("Default save path", f.getAbsolutePath());
-
+ def.put("saveTo_list.max_entries", new Long(15));
+
- def.put("update.start",TRUE);
- def.put("update.periodic",TRUE);
- def.put("update.opendialog",TRUE);
@@ -17,8 +17,8 @@
+ def.put("update.opendialog",FALSE);
def.put("update.autodownload", FALSE);
- def.put("Send Version Info", TRUE);
-@@ -488,7 +488,7 @@
+ def.put( "Config Verify Frequency", new Long( 30*60*1000 ));
+@@ -495,7 +495,7 @@
def.put( "locale", Locale.getDefault().toString() );
def.put( "locale.set.complete.count", ZERO);
def.put( "Password Confirm", null );
@@ -29,7 +29,7 @@
def.put( "diskmanager.hashchecking.smallestfirst", TRUE );
--- a/azureus2/src/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
+++ b/azureus2/src/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
-@@ -93,7 +93,7 @@
+@@ -90,7 +90,7 @@
final PluginConfig plugin_config = plugin_interface.getPluginconfig();
@@ -38,7 +38,7 @@
model.setConfigSectionID(PLUGIN_CONFIGSECTION_ID);
model.getStatus().setText( enabled?"Running":"Optional checks disabled" );
-@@ -122,7 +122,7 @@
+@@ -119,7 +119,7 @@
BasicPluginConfigModel config = ui_manager.createBasicPluginConfigModel(ConfigSection.SECTION_PLUGINS, PLUGIN_CONFIGSECTION_ID);
@@ -49,7 +49,7 @@
new PluginEventListener()
--- a/azureus3/src/com/aelitis/azureus/ui/swt/UIConfigDefaultsSWTv3.java
+++ b/azureus3/src/com/aelitis/azureus/ui/swt/UIConfigDefaultsSWTv3.java
-@@ -142,7 +142,7 @@
+@@ -139,7 +139,7 @@
defaults.addParameter("window.maximized", true);
diff --git a/debian/patches/series b/debian/patches/series
index 8b6fd96..eeaaaa4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
01_amend_build_classpath.patch
-02_speedtest.patch -p1
-03_update_disable.patch -p1
+02_speedtest.patch
+03_update_disable.patch
04_unbundle_json.patch
05_unbundle_commons_lang.patch
06_unbundle_bouncy_castle.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/azureus.git
More information about the pkg-java-commits
mailing list