[gentoo-commits] gentoo-x86 commit in net-p2p/azureus/files/patches-3.0.3.4: azureus_all_modify-for-use-with-bcprov.patch 02_all_remove-win32-TorrentListViewsUtils.patch 04_all_remove-osx-and-win32-PlatformManagerFactory.patch 03_all_remove-win32-PlatformManagerPluginDelegate.patch 01_all_remove-osx-and-win32-AzureusRestarterImpl.patch

[Petteri Raty (betelgeuse)]

betelgeuse    07/11/22 20:56:04

  Added:                azureus_all_modify-for-use-with-bcprov.patch
                        02_all_remove-win32-TorrentListViewsUtils.patch
                        04_all_remove-osx-and-win32-PlatformManagerFactory.patch
                        03_all_remove-win32-PlatformManagerPluginDelegate.patch
                        01_all_remove-osx-and-win32-AzureusRestarterImpl.patch
  Log:
  Version bump. Thanks to people in bug #184101.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  net-p2p/azureus/files/patches-3.0.3.4/azureus_all_modify-for-use-with-bcprov.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.3.4/azureus_all_modify-for-use-with-bcprov.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.3.4/azureus_all_modify-for-use-with-bcprov.patch?rev=1.1&content-type=text/plain

Index: azureus_all_modify-for-use-with-bcprov.patch
===================================================================
--- Azureus_3.0.3.4_source.orig/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java	2006-09-28 08:02:36.000000000 +0200
+++ Azureus_3.0.3.4_source/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java	2007-11-02 17:14:25.000000000 +0100
@@ -36,7 +36,7 @@
 import org.bouncycastle.crypto.encodings.PKCS1Encoding;
 import org.bouncycastle.crypto.engines.RSAEngine;
 import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.jce.provider.RSAUtil;
+import org.bouncycastle.jce.provider.DSAUtil;
 import org.gudy.azureus2.core3.util.Debug;
 import org.gudy.azureus2.plugins.utils.StaticUtilities;
 
@@ -97,7 +97,7 @@
 				
 				PKCS1Encoding	padded_eng = new PKCS1Encoding( eng );
 				
-	            CipherParameters param = RSAUtil.generatePublicKeyParameter(public_key);
+	            CipherParameters param = DSAUtil.generatePublicKeyParameter(public_key);
 	            
 	            param = new ParametersWithRandom(param, new SecureRandom());
 	            



1.1                  net-p2p/azureus/files/patches-3.0.3.4/02_all_remove-win32-TorrentListViewsUtils.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.3.4/02_all_remove-win32-TorrentListViewsUtils.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.3.4/02_all_remove-win32-TorrentListViewsUtils.patch?rev=1.1&content-type=text/plain

Index: 02_all_remove-win32-TorrentListViewsUtils.patch
===================================================================
--- Azureus_3.0.3.4_source.orig/com/aelitis/azureus/ui/swt/views/skin/TorrentListViewsUtils.java	2007-10-01 14:48:00.000000000 +0200
+++ Azureus_3.0.3.4_source/com/aelitis/azureus/ui/swt/views/skin/TorrentListViewsUtils.java	2007-11-02 16:37:00.000000000 +0100
@@ -64,7 +64,6 @@
 import com.aelitis.azureus.ui.swt.views.TorrentListViewListener;
 import com.aelitis.azureus.util.AdManager;
 import com.aelitis.azureus.util.Constants;
-import com.aelitis.azureus.util.win32.Win32Utils;
 
 import org.gudy.azureus2.plugins.PluginInterface;
 import org.gudy.azureus2.plugins.PluginManager;
@@ -602,17 +601,6 @@
 	 * @param string
 	 */
 	private static boolean runInMediaPlayer(String mediaFile) {
-		if (Constants.isWindows) {
-			String wmpEXE = Win32Utils.getWMP();
-			if (new File(wmpEXE).exists()) {
-				try {
-					Runtime.getRuntime().exec(wmpEXE + " \"" + mediaFile + "\"");
-					return true;
-				} catch (IOException e) {
-					Debug.out("error playing " + mediaFile + " via WMP " + mediaFile, e);
-				}
-			}
-		}
 		return false;
 	}
 



1.1                  net-p2p/azureus/files/patches-3.0.3.4/04_all_remove-osx-and-win32-PlatformManagerFactory.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.3.4/04_all_remove-osx-and-win32-PlatformManagerFactory.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.3.4/04_all_remove-osx-and-win32-PlatformManagerFactory.patch?rev=1.1&content-type=text/plain

Index: 04_all_remove-osx-and-win32-PlatformManagerFactory.patch
===================================================================
--- Azureus_3.0.3.4_source.orig/org/gudy/azureus2/platform/PlatformManagerFactory.java	2007-01-12 13:39:24.000000000 +0100
+++ Azureus_3.0.3.4_source/org/gudy/azureus2/platform/PlatformManagerFactory.java	2007-11-02 16:51:05.000000000 +0100
@@ -46,23 +46,7 @@
 			if ( platform_manager == null ){
 										  
 				try{
-					if ( getPlatformType() == PlatformManager.PT_WINDOWS ){
-						
-						platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
-						
-					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
-						
-	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
-	                    
-					}else if( getPlatformType() == PlatformManager.PT_UNIX ){
-						
             platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
-
-					}
-				}catch( PlatformManagerException e ){
-					
-						// exception will already have been logged
-					
 				}catch( Throwable e ){
 					
 					Debug.printStackTrace(e);



1.1                  net-p2p/azureus/files/patches-3.0.3.4/03_all_remove-win32-PlatformManagerPluginDelegate.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.3.4/03_all_remove-win32-PlatformManagerPluginDelegate.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.3.4/03_all_remove-win32-PlatformManagerPluginDelegate.patch?rev=1.1&content-type=text/plain

Index: 03_all_remove-win32-PlatformManagerPluginDelegate.patch
===================================================================
--- Azureus_3.0.3.4_source.orig/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java	2007-07-25 13:02:00.000000000 +0200
+++ Azureus_3.0.3.4_source/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java	2007-11-02 17:04:31.000000000 +0100
@@ -23,7 +23,6 @@
 import java.util.Properties;
 
 import org.gudy.azureus2.platform.unix.PlatformManagerUnixPlugin;
-import org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker;
 
 import org.gudy.azureus2.plugins.Plugin;
 import org.gudy.azureus2.plugins.PluginException;
@@ -45,10 +44,7 @@
 		PlatformManager platform = PlatformManagerFactory.getPlatformManager();
 
 		int platformType = platform.getPlatformType();
-		if (platformType == PlatformManager.PT_WINDOWS) {
-			PlatformManagerUpdateChecker plugin = new PlatformManagerUpdateChecker();
-			plugin.initialize(pluginInterface);
-		} else if (platformType == PlatformManager.PT_UNIX) {
+		if (platformType == PlatformManager.PT_UNIX) {
 			PlatformManagerUnixPlugin plugin = new PlatformManagerUnixPlugin();
 			plugin.initialize(pluginInterface);
 		} else {



1.1                  net-p2p/azureus/files/patches-3.0.3.4/01_all_remove-osx-and-win32-AzureusRestarterImpl.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.3.4/01_all_remove-osx-and-win32-AzureusRestarterImpl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.3.4/01_all_remove-osx-and-win32-AzureusRestarterImpl.patch?rev=1.1&content-type=text/plain

Index: 01_all_remove-osx-and-win32-AzureusRestarterImpl.patch
===================================================================
--- Azureus_3.0.3.4_source.orig/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java	2007-07-30 14:13:28.000000000 +0200
+++ Azureus_3.0.3.4_source/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java	2007-11-02 16:46:56.000000000 +0100
@@ -30,8 +30,6 @@
 import org.gudy.azureus2.platform.PlatformManager;
 import org.gudy.azureus2.platform.PlatformManagerFactory;
 import org.gudy.azureus2.platform.unix.ScriptAfterShutdown;
-import org.gudy.azureus2.platform.win32.access.AEWin32Access;
-import org.gudy.azureus2.platform.win32.access.AEWin32Manager;
 import org.gudy.azureus2.update.UpdaterUtils;
 
 import com.aelitis.azureus.core.AzureusCore;
@@ -297,140 +295,6 @@
 		return null;
 	}
 
-  private boolean restartViaEXE(PrintWriter log,
-  		String exeUpdater,
-      String[]  properties,
-      String[]  parameters,
-      String backupJavaRunString,
-      boolean update_only) 
-  {
-		String azRunner = null;
-		File fileRestart = null;
-		if (!update_only) {
-  		try {
-  			azRunner = PlatformManagerFactory.getPlatformManager().getApplicationCommandLine();
-  		} catch (PlatformManagerException e) {
-  			// TODO Auto-generated catch block
-  			e.printStackTrace();
-  		}
-		}
-
-		try {
-			int result;
-			AEWin32Access accessor = AEWin32Manager.getAccessor(true);
-			if (accessor == null) {
-				result = -123;
-			} else {
-				if (azRunner != null) {
-					// create a batch file to run the updater, then to restart azureus
-					// bceause the updater would restart azureus as administrator user
-					// and confuse the user
-					fileRestart = FileUtil.getUserFile("restart.bat");
-					String s = "title Azureus Updater Runner\r\n";
-					s += exeUpdater + " \"updateonly\"";
-					for (int i = 1; i < parameters.length; i++) {
-						s += " \"" + parameters[i].replaceAll("\\\"", "") + "\"";
-					}
-					s += "\r\n";
-					s += "start \"\" \"" + azRunner + "\"";
-					FileUtil.writeBytesAsFile(fileRestart.getAbsolutePath(), s.getBytes());
-
-					result = accessor.shellExecute(null, fileRestart.getAbsolutePath(),
-							null, SystemProperties.getApplicationPath(),
-							AEWin32Access.SW_SHOWMINIMIZED);
-				} else {
-					String execEXE = "\"-J" + getClassPath().replaceAll("\\\"", "")
-							+ "\" ";
-
-					for (int i = 0; i < properties.length; i++) {
-						execEXE += "\"-J" + properties[i].replaceAll("\\\"", "") + "\" ";
-					}
-
-					for (int i = 0; i < parameters.length; i++) {
-						execEXE += " \"" + parameters[i].replaceAll("\\\"", "") + "\"";
-					}
-
-					log.println("Launch via " + exeUpdater + " params " + execEXE);
-					result = accessor.shellExecute(null, exeUpdater, execEXE,
-							SystemProperties.getApplicationPath(), AEWin32Access.SW_NORMAL);
-				}
-			}
-
-			/*
-			 * Some results:
-			 * 0: OOM
-			 * 2: FNF
-			 * 3: Path Not Foud
-			 * 5: Access Denied (User clicked cancel on admin access dialog)
-			 * 8: OOM
-			 * 11: Bad Format
-			 * 26: Sharing Violation
-			 * 27: Association incomplete
-			 * 28: DDE Timeout
-			 * 29: DDE Fail
-			 * 30: DDE Busy
-			 * 31: No Association
-			 * 32: DLL Not found
-			 * >32: OK!
-			 */
-			log.println("   -> " + result);
-
-			if (result <= 32) {
-				String sErrorReason = "";
-				String key = null;
-
-				switch (result) {
-					case 0:
-					case 8:
-						key = "oom";
-						break;
-
-					case 2:
-						key = "fnf";
-						break;
-
-					case 3:
-						key = "pnf";
-						break;
-
-					case 5:
-						key = "denied";
-						break;
-
-					case 11:
-						key = "bad";
-						break;
-
-					case -123:
-						key = "nowin32";
-						break;
-
-					default:
-						sErrorReason = "" + result;
-						break;
-				}
-				if (key != null) {
-					sErrorReason = MessageText.getString("restart.error." + key,
-							new String[] {
-								exeUpdater,
-								SystemProperties.getApplicationPath(),
-							});
-				}
-				Logger.log(new LogAlert(false, LogAlert.AT_ERROR,
-						MessageText.getString("restart.error", new String[] {
-							sErrorReason
-						})));
-				return false;
-			}
-		} catch (Throwable f) {
-
-			f.printStackTrace(log);
-
-			return javaSpawn(log, backupJavaRunString);
-		}
-
-		return true;
-	}
   
 
   // ****************** This code is copied into Restarter / Updater so make changes there too !!!
@@ -446,57 +310,9 @@
     String[]  parameters,
     boolean update_only) 
   {
-    if(Constants.isOSX){
-    	
-    	restartAzureus_OSX(log,mainClass,properties,parameters);
-    	
-    }else if( Constants.isUnix ){
-    	
     	restartAzureus_Unix(log,mainClass,properties,parameters);
-      
-    }else{
-    	
-    	restartAzureus_win32(log,mainClass,properties,parameters,update_only);
-    }
   }
   
-  private void 
-  restartAzureus_win32(
-      PrintWriter log,
-    String    mainClass,
-    String[]  properties,
-    String[]  parameters,
-    boolean	update_only) 
-  {
-  	String exeUpdater = getExeUpdater(log);  // Not for Updater.java
-
-  	String exec;
-
-		//Classic restart way using Runtime.exec directly on java(w)
-		exec = "\"" + JAVA_EXEC_DIR + "javaw\" " + getClassPath() + getLibraryPath();
-
-		for (int i = 0; i < properties.length; i++) {
-			exec += properties[i] + " ";
-		}
-
-		exec += mainClass;
-
-		for (int i = 0; i < parameters.length; i++) {
-			exec += " \"" + parameters[i] + "\"";
-		}
-
-		if (exeUpdater != null) {
-			restartViaEXE(log, exeUpdater, properties, parameters, exec, update_only);
-		} else {
-			if (log != null) {
-				log.println("  " + exec);
-			}
-
-			if (!win32NativeRestart(log, exec)) {
-				javaSpawn(log, exec);
-			}
-		}
-	}
   
 
 	private boolean



-- 
gentoo-commits@g.o mailing list