rpms/azureus/F-11 azureus-no-update-manager-CoreUpdateChecker.patch, 1.5, 1.6 azureus-no-update-manager-PluginInstallerImpl.patch, 1.3, 1.4 azureus-no-update-manager-PluginUpdatePlugin.patch, 1.1, 1.2 azureus-no-update-manager-SWTUpdateChecker.patch, 1.6, 1.7 azureus-no-update-manager-UpdateMonitor.patch, 1.7, 1.8 azureus-no-updates-PluginInitializer.patch, 1.3, 1.4 azureus-no-updates-PluginInterfaceImpl.patch, 1.3, 1.4 azureus.script, 1.23, 1.24 azureus.spec, 1.76, 1.77
David Juran
djuran at fedoraproject.org
Sat Sep 5 17:50:46 UTC 2009
Author: djuran
Update of /cvs/pkgs/rpms/azureus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5756
Modified Files:
azureus-no-update-manager-CoreUpdateChecker.patch
azureus-no-update-manager-PluginInstallerImpl.patch
azureus-no-update-manager-PluginUpdatePlugin.patch
azureus-no-update-manager-SWTUpdateChecker.patch
azureus-no-update-manager-UpdateMonitor.patch
azureus-no-updates-PluginInitializer.patch
azureus-no-updates-PluginInterfaceImpl.patch azureus.script
azureus.spec
Log Message:
- Fix SWT dir on x86_64 (Bz 515228)
- revive the no-updates patches
azureus-no-update-manager-CoreUpdateChecker.patch:
CoreUpdateChecker.java | 302 -------------------------------------------------
1 file changed, 1 insertion(+), 301 deletions(-)
Index: azureus-no-update-manager-CoreUpdateChecker.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-update-manager-CoreUpdateChecker.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- azureus-no-update-manager-CoreUpdateChecker.patch 3 Dec 2007 17:03:21 -0000 1.5
+++ azureus-no-update-manager-CoreUpdateChecker.patch 5 Sep 2009 17:50:45 -0000 1.6
@@ -1,6 +1,7 @@
---- ../azureus3orig/azureus3/org/gudy/azureus2/update/CoreUpdateChecker.java 2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/update/CoreUpdateChecker.java 2007-12-03 10:30:37.000000000 -0500
-@@ -124,8 +124,6 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker azureus-4.0.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java
+--- azureus-4.0.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker 2008-09-15 14:16:22.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java 2009-09-03 20:44:17.000000000 +0300
+@@ -125,8 +125,6 @@ CoreUpdateChecker
props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
@@ -9,7 +10,7 @@
}
public String
-@@ -144,302 +142,10 @@
+@@ -145,309 +143,11 @@ CoreUpdateChecker
checkForUpdate(
final UpdateChecker checker )
{
@@ -24,6 +25,11 @@
-
- displayUserMessage( decoded );
-
+- // No point complaining later if we don't have any data in the map (which is
+- // more likely due to network problems rather than the version check server
+- // *actually* returning a map with nothing in it.
+- if (decoded.isEmpty()) {return;}
+-
- String latest_version;
- String latest_file_name;
-
@@ -188,7 +194,7 @@
- if ( info_b != null ){
-
- try{
-- info = new String( info_b );
+- info = new String( info_b, "UTF-8" );
-
- }catch( Throwable e ){
-
@@ -301,6 +307,8 @@
-
- Debug.printStackTrace( e );
-
+- checker.reportProgress( "Failed to check for core update: " + Debug.getNestedExceptionMessage(e));
+-
- checker.failed();
-
- }finally{
@@ -309,6 +317,7 @@
first_check = false;
- }
++
}
azureus-no-update-manager-PluginInstallerImpl.patch:
PluginInstallerImpl.java | 394 +++++++++++++++++++++++------------------------
1 file changed, 195 insertions(+), 199 deletions(-)
Index: azureus-no-update-manager-PluginInstallerImpl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-update-manager-PluginInstallerImpl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-no-update-manager-PluginInstallerImpl.patch 3 Dec 2007 17:03:21 -0000 1.3
+++ azureus-no-update-manager-PluginInstallerImpl.patch 5 Sep 2009 17:50:45 -0000 1.4
@@ -1,22 +1,165 @@
---- ../azureus3orig/azureus3/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java 2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java 2007-12-03 10:32:17.000000000 -0500
-@@ -181,13 +181,6 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl.patch azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java
+--- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.no-update-manager-PluginInstallerImpl.patch 2008-09-25 14:32:04.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java 2009-09-05 19:50:42.000000000 +0300
+@@ -376,87 +376,87 @@ PluginInstallerImpl
{
PluginUpdatePlugin pup = (PluginUpdatePlugin)manager.getPluginInterfaceByClass( PluginUpdatePlugin.class ).getPlugin();
-- UpdateManager uman = manager.getDefaultPluginInterface().getUpdateManager();
--
+- UpdateManagerImpl uman = (UpdateManagerImpl)manager.getDefaultPluginInterface().getUpdateManager();
++// UpdateManagerImpl uman = (UpdateManagerImpl)manager.getDefaultPluginInterface().getUpdateManager();
+
- UpdateCheckInstance inst =
- uman.createEmptyUpdateCheckInstance(
- UpdateCheckInstance.UCI_INSTALL,
-- "update.instance.install" );
+- "update.instance.install",
+- low_noise );
-
+- if ( listener != null ){
+-
+- inst.addListener(
+- new UpdateCheckInstanceListener()
+- {
+- public void
+- cancelled(
+- UpdateCheckInstance instance )
+- {
+- listener.failed( new PluginException( "Installation cancelled" ));
+- }
+-
+- public void
+- complete(
+- UpdateCheckInstance instance )
+- {
+- final Update[] updates = instance.getUpdates();
++// UpdateCheckInstance inst =
++// uman.createEmptyUpdateCheckInstance(
++// UpdateCheckInstance.UCI_INSTALL,
++// "update.instance.install",
++// low_noise );
++
++// if ( listener != null ){
++
++// inst.addListener(
++// new UpdateCheckInstanceListener()
++// {
++// public void
++// cancelled(
++// UpdateCheckInstance instance )
++// {
++// listener.failed( new PluginException( "Installation cancelled" ));
++// }
++
++// public void
++// complete(
++// UpdateCheckInstance instance )
++// {
++// final Update[] updates = instance.getUpdates();
+
+- if ( updates.length == 0 ){
++// if ( updates.length == 0 ){
+
+- listener.failed( new PluginException( "No updates were added during check process" ));
++// listener.failed( new PluginException( "No updates were added during check process" ));
+
+- }else{
++// }else{
+
+- for (int i=0;i<updates.length;i++){
++// for (int i=0;i<updates.length;i++){
+
+- updates[i].addListener(
+- new UpdateListener()
+- {
+- private boolean cancelled;
++// updates[i].addListener(
++// new UpdateListener()
++// {
++// private boolean cancelled;
+
+- public void
+- cancelled(
+- Update update)
+- {
+- cancelled = true;
++// public void
++// cancelled(
++// Update update)
++// {
++// cancelled = true;
+
+- check();
+- }
++// check();
++// }
+
+- public void
+- complete(
+- Update update )
+- {
+- check();
+- }
++// public void
++// complete(
++// Update update )
++// {
++// check();
++// }
+
+- protected void
+- check()
+- {
+- for (int i=0;i<updates.length;i++){
++// protected void
++// check()
++// {
++// for (int i=0;i<updates.length;i++){
+
+- if ( !updates[i].isCancelled() && !updates[i].isComplete()){
++// if ( !updates[i].isCancelled() && !updates[i].isComplete()){
+
+- return;
+- }
+- }
++// return;
++// }
++// }
+
+- if ( cancelled ){
++// if ( cancelled ){
+
+- listener.failed( new PluginException( "Installation cancelled" ));
++// listener.failed( new PluginException( "Installation cancelled" ));
+
+- }else{
++// }else{
+
+- listener.done();
+- }
+- }
+- });
+- }
+- }
+- }
+- });
+- }
++// listener.done();
++// }
++// }
++// });
++// }
++// }
++// }
++// });
++// }
+
try{
- for (int i=0;i<plugins.length;i++){
-@@ -254,23 +247,6 @@
+@@ -522,56 +522,52 @@ PluginInstallerImpl
+
+ final PluginInterface dummy_plugin_interface = manager.getPluginInterfaceByID( plugin_id, false );
- ((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
+- ((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
++// ((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
- inst.addListener(
- new UpdateCheckInstanceListener()
@@ -25,20 +168,67 @@
- cancelled(
- UpdateCheckInstance instance )
- {
-- dummy_plugin.requestUnload();
+- try{
++// inst.addListener(
++// new UpdateCheckInstanceListener()
++// {
++// public void
++// cancelled(
++// UpdateCheckInstance instance )
++// {
++// try{
+
+- dummy_plugin_interface.getPluginState().unload();
++// dummy_plugin_interface.getPluginState().unload();
+
+- }catch( Throwable e ){
++// }catch( Throwable e ){
+
+- Debug.out( "Failed to unload plugin", e );
+- }
- }
--
++// Debug.out( "Failed to unload plugin", e );
++// }
++// }
+
- public void
- complete(
- UpdateCheckInstance instance )
- {
-- dummy_plugin.requestUnload();
+- PluginInterface pi = manager.getPluginInterfaceByID( plugin_id, false );
++// public void
++// complete(
++// UpdateCheckInstance instance )
++// {
++// PluginInterface pi = manager.getPluginInterfaceByID( plugin_id, false );
+
+- if ( pi != null && pi.getPlugin() instanceof FailedPlugin ){
++// if ( pi != null && pi.getPlugin() instanceof FailedPlugin ){
+
+- try{
+- pi.getPluginState().unload();
++// try{
++// pi.getPluginState().unload();
+
+- }catch( Throwable e ){
++// }catch( Throwable e ){
+
+- Debug.out( "Failed to unload plugin", e );
+- }
+- }
++// Debug.out( "Failed to unload plugin", e );
++// }
++// }
+
- }
- });
- }else{
+- }else{
++// }
++// });
++// }else{
- ((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
-@@ -278,12 +254,8 @@
+- ((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
++// ((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
}
}
@@ -51,24 +241,33 @@
if ( e instanceof PluginException ){
throw((PluginException)e);
-@@ -347,138 +319,6 @@
+@@ -635,138 +631,138 @@ PluginInstallerImpl
}
}
- try{
- UpdateManager uman = manager.getDefaultPluginInterface().getUpdateManager();
--
++// try{
++// UpdateManager uman = manager.getDefaultPluginInterface().getUpdateManager();
+
- UpdateCheckInstance inst =
- uman.createEmptyUpdateCheckInstance(
- UpdateCheckInstance.UCI_UNINSTALL,
- "update.instance.uninstall");
--
++// UpdateCheckInstance inst =
++// uman.createEmptyUpdateCheckInstance(
++// UpdateCheckInstance.UCI_UNINSTALL,
++// "update.instance.uninstall");
+
- for (int i=0;i<pis.length;i++){
--
++// for (int i=0;i<pis.length;i++){
+
- final PluginInterface pi = pis[i];
--
++// final PluginInterface pi = pis[i];
+
- final String plugin_dir = pi.getPluginDirectoryName();
--
++// final String plugin_dir = pi.getPluginDirectoryName();
+
- inst.addUpdatableComponent(
- new UpdatableComponent()
- {
@@ -83,7 +282,21 @@
- {
- return( 0 );
- }
--
++// inst.addUpdatableComponent(
++// new UpdatableComponent()
++// {
++// public String
++// getName()
++// {
++// return( pi.getPluginName());
++// }
++
++// public int
++// getMaximumCheckTime()
++// {
++// return( 0 );
++// }
+
- public void
- checkForUpdate(
- final UpdateChecker checker )
@@ -91,7 +304,14 @@
- try{
- ResourceDownloader rd =
- manager.getDefaultPluginInterface().getUtilities().getResourceDownloaderFactory().create( new File( plugin_dir ));
--
++// public void
++// checkForUpdate(
++// final UpdateChecker checker )
++// {
++// try{
++// ResourceDownloader rd =
++// manager.getDefaultPluginInterface().getUtilities().getResourceDownloaderFactory().create( new File( plugin_dir ));
+
- rd.addListener(
- new ResourceDownloaderAdapter()
- {
@@ -101,31 +321,54 @@
- InputStream data )
- {
- try{
-- if ( pi.isUnloadable()){
--
-- pi.unload();
--
+- if ( pi.getPluginState().isUnloadable()){
++// rd.addListener(
++// new ResourceDownloaderAdapter()
++// {
++// public boolean
++// completed(
++// ResourceDownloader downloader,
++// InputStream data )
++// {
++// try{
++// if ( pi.getPluginState().isUnloadable()){
+
+- pi.getPluginState().unload();
++// pi.getPluginState().unload();
+
- FileUtil.recursiveDelete( new File( plugin_dir ));
--
++// FileUtil.recursiveDelete( new File( plugin_dir ));
+
- }
--
++// }
+
- UpdateInstaller installer = checker.createInstaller();
--
++// UpdateInstaller installer = checker.createInstaller();
+
- installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
--
--
++// installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
+
+
- }catch( Throwable e ){
--
++// }catch( Throwable e ){
+
- Debug.printStackTrace(e);
- Logger.log(new LogAlert(LogAlert.REPEATABLE,
- "Plugin uninstall failed", e));
- }
--
++// Debug.printStackTrace(e);
++// Logger.log(new LogAlert(LogAlert.REPEATABLE,
++// "Plugin uninstall failed", e));
++// }
+
- // don't close the stream as we process it later
--
++// // don't close the stream as we process it later
+
- return( true );
- }
--
++// return( true );
++// }
+
- public void
- failed(
- ResourceDownloader downloader,
@@ -137,13 +380,27 @@
- }
- }
- });
--
++// public void
++// failed(
++// ResourceDownloader downloader,
++// ResourceDownloaderException e )
++// {
++// if ( !downloader.isCancelled()){
++// Logger.log(new LogAlert(LogAlert.REPEATABLE,
++// "Plugin uninstall failed", e));
++// }
++// }
++// });
+
- // the plugin may have > 1 plugin interfaces, make the name up appropriately
--
++// // the plugin may have > 1 plugin interfaces, make the name up appropriately
+
- String update_name = "";
--
++// String update_name = "";
+
- PluginInterface[] ifs = manager.getPluginInterfaces();
--
++// PluginInterface[] ifs = manager.getPluginInterfaces();
+
- Arrays.sort(
- ifs,
- new Comparator()
@@ -156,37 +413,70 @@
- return(((PluginInterface)o1).getPluginName().compareTo(((PluginInterface)o2).getPluginName()));
- }
- });
--
++// Arrays.sort(
++// ifs,
++// new Comparator()
++// {
++// public int
++// compare(
++// Object o1,
++// Object o2)
++// {
++// return(((PluginInterface)o1).getPluginName().compareTo(((PluginInterface)o2).getPluginName()));
++// }
++// });
+
- for (int i=0;i<ifs.length;i++){
--
++// for (int i=0;i<ifs.length;i++){
+
- if ( ifs[i].getPluginID().equals(pi.getPluginID())){
--
++// if ( ifs[i].getPluginID().equals(pi.getPluginID())){
+
- update_name += (update_name.length()==0?"":",") + ifs[i].getPluginName();
- }
- }
--
++// update_name += (update_name.length()==0?"":",") + ifs[i].getPluginName();
++// }
++// }
+
- checker.addUpdate(
- update_name,
- new String[]{ "Uninstall: " + plugin_dir},
- pi.getPluginVersion(),
- rd,
-- pi.isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
--
+- pi.getPluginState().isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
++// checker.addUpdate(
++// update_name,
++// new String[]{ "Uninstall: " + plugin_dir},
++// pi.getPluginVersion(),
++// rd,
++// pi.getPluginState().isUnloadable()?Update.RESTART_REQUIRED_NO:Update.RESTART_REQUIRED_YES );
+
- }finally{
--
++// }finally{
+
- checker.completed();
- }
--
++// checker.completed();
++// }
+
- }
- }, false );
- }
--
++// }
++// }, false );
++// }
+
- inst.start();
--
++// inst.start();
+
- }catch( Throwable e ){
--
++// }catch( Throwable e ){
+
- Debug.printStackTrace(e);
- }
++// Debug.printStackTrace(e);
++// }
}
protected PluginInterface
azureus-no-update-manager-PluginUpdatePlugin.patch:
PluginUpdatePlugin.java | 234 ++++++++++++++++++++++++------------------------
1 file changed, 117 insertions(+), 117 deletions(-)
Index: azureus-no-update-manager-PluginUpdatePlugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-update-manager-PluginUpdatePlugin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-no-update-manager-PluginUpdatePlugin.patch 10 Feb 2006 17:00:46 -0000 1.1
+++ azureus-no-update-manager-PluginUpdatePlugin.patch 5 Sep 2009 17:50:45 -0000 1.2
@@ -1,11 +1,13 @@
---- org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.orig 2006-02-09 23:32:49.000000000 -0500
-+++ org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java 2006-02-09 23:33:49.000000000 -0500
-@@ -130,20 +130,6 @@
-
- config.addBooleanParameter2( "enable.update", "Plugin.pluginupdate.enablecheck", true );
-
+diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.no-update-manager-PluginUpdatePlugin azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
+--- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java.no-update-manager-PluginUpdatePlugin 2008-09-25 14:32:04.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java 2009-09-05 17:29:07.000000000 +0300
+@@ -138,19 +138,19 @@ PluginUpdatePlugin
+ initComplete(
+ final PluginConfig plugin_config )
+ {
- UpdateManager update_manager = plugin_interface.getUpdateManager();
--
++// UpdateManager update_manager = plugin_interface.getUpdateManager();
+
- update_manager.addListener(
- new UpdateManagerListener()
- {
@@ -15,17 +17,25 @@
- {
- SFPluginDetailsLoaderFactory.getSingleton().reset();
- }
--
++// update_manager.addListener(
++// new UpdateManagerListener()
++// {
++// public void
++// checkInstanceCreated(
++// UpdateCheckInstance inst )
++// {
++// SFPluginDetailsLoaderFactory.getSingleton().reset();
++// }
+
- });
--
- final PluginManager plugin_manager = plugin_interface.getPluginManager();
++// });
- PluginInterface[] plugins = plugin_manager.getPlugins();
-@@ -169,134 +155,6 @@
+ final PluginManager plugin_manager = plugin_interface.getPluginManager();
+@@ -178,133 +178,133 @@ PluginUpdatePlugin
final int f_non_mandatory_count = non_mandatory_count;
final int f_mandatory_count = mandatory_count;
--
+
- update_manager.registerUpdatableComponent(
- new UpdatableComponent()
- {
@@ -34,51 +44,86 @@
- {
- return( "Non-mandatory plugins" );
- }
--
++// update_manager.registerUpdatableComponent(
++// new UpdatableComponent()
++// {
++// public String
++// getName()
++// {
++// return( "Non-mandatory plugins" );
++// }
+
- public int
- getMaximumCheckTime()
- {
- return( f_non_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
- }
--
++// public int
++// getMaximumCheckTime()
++// {
++// return( f_non_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
++// }
+
- public void
- checkForUpdate(
- UpdateChecker checker )
- {
- if ( checkForUpdateSupport( checker, null, false ) == 0 ){
--
++// public void
++// checkForUpdate(
++// UpdateChecker checker )
++// {
++// if ( checkForUpdateSupport( checker, null, false ) == 0 ){
+
- String[] rps = VersionCheckClient.getSingleton(). getRecommendedPlugins();
--
++// String[] rps = VersionCheckClient.getSingleton(). getRecommendedPlugins();
+
- boolean found_one = false;
--
++// boolean found_one = false;
+
- for (int i=0;i<rps.length;i++){
--
++// for (int i=0;i<rps.length;i++){
+
- String rp_id = rps[i];
--
-- if ( plugin_manager.getPluginInterfaceByID( rp_id ) != null ){
--
++// String rp_id = rps[i];
+
+- if ( plugin_manager.getPluginInterfaceByID( rp_id, false ) != null ){
++// if ( plugin_manager.getPluginInterfaceByID( rp_id, false ) != null ){
+
- // already installed
--
++// // already installed
+
- continue;
- }
--
++// continue;
++// }
+
- final String config_key = "recommended.processed." + rp_id;
--
++// final String config_key = "recommended.processed." + rp_id;
+
- if ( !plugin_config.getPluginBooleanParameter( config_key, false )){
--
++// if ( !plugin_config.getPluginBooleanParameter( config_key, false )){
+
- try{
- final PluginInstaller installer = plugin_interface.getPluginManager().getPluginInstaller();
--
++// try{
++// final PluginInstaller installer = plugin_interface.getPluginManager().getPluginInstaller();
+
- StandardPlugin[] sps = installer.getStandardPlugins();
--
++// StandardPlugin[] sps = installer.getStandardPlugins();
+
- for (int j=0;j<sps.length;j++){
--
++// for (int j=0;j<sps.length;j++){
+
- final StandardPlugin sp = sps[j];
--
++// final StandardPlugin sp = sps[j];
+
- if ( sp.getId().equals( rp_id )){
--
++// if ( sp.getId().equals( rp_id )){
+
- found_one = true;
--
++// found_one = true;
+
- checker.getCheckInstance().addListener(
- new UpdateCheckInstanceListener()
- {
@@ -87,15 +132,29 @@
- UpdateCheckInstance instance )
- {
- }
--
++// checker.getCheckInstance().addListener(
++// new UpdateCheckInstanceListener()
++// {
++// public void
++// cancelled(
++// UpdateCheckInstance instance )
++// {
++// }
+
- public void
- complete(
- UpdateCheckInstance instance )
- {
- if ( instance.getUpdates().length == 0 ){
--
++// public void
++// complete(
++// UpdateCheckInstance instance )
++// {
++// if ( instance.getUpdates().length == 0 ){
+
- installRecommendedPlugin( installer, sp );
--
++// installRecommendedPlugin( installer, sp );
+
- plugin_config.setPluginParameter( config_key, true );
- }
- }
@@ -153,6 +212,63 @@
- log.log( LoggerChannel.LT_INFORMATION, "**** Update check starts ****" );
- }
- });
++// plugin_config.setPluginParameter( config_key, true );
++// }
++// }
++// });
++
++// break;
++// }
++// }
++
++// }catch( Throwable e ){
++
++// }
++// }
++
++// if ( found_one ){
++
++// break;
++// }
++// }
++// }
++// }
++
++// }, false );
++
++// update_manager.registerUpdatableComponent(
++// new UpdatableComponent()
++// {
++// public String
++// getName()
++// {
++// return( "Mandatory plugins" );
++// }
++
++// public int
++// getMaximumCheckTime()
++// {
++// return( f_mandatory_count * (( RD_SIZE_RETRIES * RD_SIZE_TIMEOUT )/1000));
++// }
++
++// public void
++// checkForUpdate(
++// UpdateChecker checker )
++// {
++// checkForUpdateSupport( checker, null, true );
++// }
++// }, true );
++
++// update_manager.addListener(
++// new UpdateManagerListener()
++// {
++// public void
++// checkInstanceCreated(
++// UpdateCheckInstance instance )
++// {
++// log.log( LoggerChannel.LT_INFORMATION, "**** Update check starts ****" );
++// }
++// });
}
protected void
azureus-no-update-manager-SWTUpdateChecker.patch:
SWTUpdateChecker.java | 226 +++++++++++++++++++++++++-------------------------
1 file changed, 113 insertions(+), 113 deletions(-)
Index: azureus-no-update-manager-SWTUpdateChecker.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-update-manager-SWTUpdateChecker.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- azureus-no-update-manager-SWTUpdateChecker.patch 7 Dec 2007 15:58:19 -0000 1.6
+++ azureus-no-update-manager-SWTUpdateChecker.patch 5 Sep 2009 17:50:45 -0000 1.7
@@ -1,10 +1,12 @@
---- iorigorg/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2007-12-07 09:52:45.000000000 -0500
-@@ -64,180 +64,12 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.no-update-manager-SWTUpdateChecker azureus-4.0.0.4/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java
+--- azureus-4.0.0.4/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.no-update-manager-SWTUpdateChecker 2008-08-20 12:14:50.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2009-09-05 17:34:43.000000000 +0300
+@@ -64,180 +64,180 @@ public class SWTUpdateChecker implements
public static void
initialize()
{
- PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
++// PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
}
public SWTUpdateChecker() {
@@ -13,87 +15,138 @@
public void checkForUpdate(final UpdateChecker checker) {
- try{
- SWTVersionGetter versionGetter = new SWTVersionGetter( checker );
--
-- boolean update_required = versionGetter.needsUpdate() &&
-- System.getProperty("azureus.skipSWTcheck") == null ;
--
++// try{
++// SWTVersionGetter versionGetter = new SWTVersionGetter( checker );
+
+- boolean update_required = System.getProperty("azureus.skipSWTcheck") == null && versionGetter.needsUpdate();
++// boolean update_required = System.getProperty("azureus.skipSWTcheck") == null && versionGetter.needsUpdate();
+
- if ( update_required ){
--
++// if ( update_required ){
+
- int update_prevented_version = COConfigurationManager.getIntParameter( "swt.update.prevented.version", -1 );
--
++// int update_prevented_version = COConfigurationManager.getIntParameter( "swt.update.prevented.version", -1 );
+
- try{
- URL swt_url = SWT.class.getClassLoader().getResource("org/eclipse/swt/SWT.class");
--
++// try{
++// URL swt_url = SWT.class.getClassLoader().getResource("org/eclipse/swt/SWT.class");
+
- if ( swt_url != null ){
--
++// if ( swt_url != null ){
+
- String url_str = swt_url.toExternalForm();
--
++// String url_str = swt_url.toExternalForm();
+
- if ( url_str.startsWith("jar:file:")){
--
++// if ( url_str.startsWith("jar:file:")){
+
- File jar_file = FileUtil.getJarFileFromURL(url_str);
--
++// File jar_file = FileUtil.getJarFileFromURL(url_str);
+
- String expected_location;
--
++// String expected_location;
+
- if ( Constants.isOSX ){
--
++// if ( Constants.isOSX ){
+
- expected_location = checker.getCheckInstance().getManager().getInstallDir() + OSX_APP + "/Contents/Resources/Java";
--
++// expected_location = checker.getCheckInstance().getManager().getInstallDir() + OSX_APP + "/Contents/Resources/Java";
+
- }else{
--
++// }else{
+
- expected_location = checker.getCheckInstance().getManager().getInstallDir();
- }
--
++// expected_location = checker.getCheckInstance().getManager().getInstallDir();
++// }
+
- File expected_dir = new File( expected_location );
--
++// File expected_dir = new File( expected_location );
+
- File jar_file_dir = jar_file.getParentFile();
--
++// File jar_file_dir = jar_file.getParentFile();
+
- // sanity check
--
++// // sanity check
+
- if ( expected_dir.exists() && jar_file_dir.exists() ){
--
++// if ( expected_dir.exists() && jar_file_dir.exists() ){
+
- expected_dir = expected_dir.getCanonicalFile();
- jar_file_dir = jar_file_dir.getCanonicalFile();
--
++// expected_dir = expected_dir.getCanonicalFile();
++// jar_file_dir = jar_file_dir.getCanonicalFile();
+
- if ( expected_dir.equals( jar_file_dir )){
--
++// if ( expected_dir.equals( jar_file_dir )){
+
- // everything looks ok
--
++// // everything looks ok
+
- if ( update_prevented_version != -1 ){
--
++// if ( update_prevented_version != -1 ){
+
- update_prevented_version = -1;
--
++// update_prevented_version = -1;
+
- COConfigurationManager.setParameter( "swt.update.prevented.version", update_prevented_version );
- }
- }else{
--
++// COConfigurationManager.setParameter( "swt.update.prevented.version", update_prevented_version );
++// }
++// }else{
+
- // we need to periodically remind the user there's a problem as they need to realise that
- // it is causing ALL updates (core/plugin) to fail
--
++// // we need to periodically remind the user there's a problem as they need to realise that
++// // it is causing ALL updates (core/plugin) to fail
+
+- String alert =
+- MessageText.getString(
+- "swt.alert.cant.update",
+- new String[]{
+- String.valueOf( versionGetter.getCurrentVersion()),
+- String.valueOf( versionGetter.getLatestVersion()),
+- jar_file_dir.toString(),
+- expected_dir.toString()});
++// String alert =
++// MessageText.getString(
++// "swt.alert.cant.update",
++// new String[]{
++// String.valueOf( versionGetter.getCurrentVersion()),
++// String.valueOf( versionGetter.getLatestVersion()),
++// jar_file_dir.toString(),
++// expected_dir.toString()});
+
+- checker.reportProgress( alert );
++// checker.reportProgress( alert );
+
- long last_prompt = COConfigurationManager.getLongParameter( "swt.update.prevented.version.time", 0 );
- long now = SystemTime.getCurrentTime();
--
++// long last_prompt = COConfigurationManager.getLongParameter( "swt.update.prevented.version.time", 0 );
++// long now = SystemTime.getCurrentTime();
+
- boolean force = now < last_prompt || now - last_prompt > 7*24*60*60*1000;
--
++// boolean force = now < last_prompt || now - last_prompt > 7*24*60*60*1000;
+
- if ( !checker.getCheckInstance().isAutomatic()){
--
++// if ( !checker.getCheckInstance().isAutomatic()){
+
- force = true;
- }
--
++// force = true;
++// }
+
- if ( force || update_prevented_version != versionGetter.getCurrentVersion()){
--
-- String alert =
-- MessageText.getString(
-- "swt.alert.cant.update",
-- new String[]{
-- String.valueOf( versionGetter.getCurrentVersion()),
-- String.valueOf( versionGetter.getLatestVersion()),
-- jar_file_dir.toString(),
-- expected_dir.toString()});
--
++// if ( force || update_prevented_version != versionGetter.getCurrentVersion()){
+
- Logger.log( new LogAlert(LogAlert.REPEATABLE, LogEvent.LT_ERROR, alert ));
--
++// Logger.log( new LogAlert(LogAlert.REPEATABLE, LogEvent.LT_ERROR, alert ));
+
- update_prevented_version = versionGetter.getCurrentVersion();
--
++// update_prevented_version = versionGetter.getCurrentVersion();
+
- COConfigurationManager.setParameter( "swt.update.prevented.version", update_prevented_version );
- COConfigurationManager.setParameter( "swt.update.prevented.version.time", now );
- }
@@ -102,25 +155,43 @@
- }
- }
- }catch( Throwable e ){
--
++// COConfigurationManager.setParameter( "swt.update.prevented.version", update_prevented_version );
++// COConfigurationManager.setParameter( "swt.update.prevented.version.time", now );
++// }
++// }
++// }
++// }
++// }
++// }catch( Throwable e ){
+
- Debug.printStackTrace(e);
- }
--
++// Debug.printStackTrace(e);
++// }
+
- if ( update_prevented_version == versionGetter.getCurrentVersion()){
--
++// if ( update_prevented_version == versionGetter.getCurrentVersion()){
+
- Logger.log(new LogEvent(LOGID, LogEvent.LT_ERROR, "SWT update aborted due to previously reported issues regarding its install location" ));
--
++// Logger.log(new LogEvent(LOGID, LogEvent.LT_ERROR, "SWT update aborted due to previously reported issues regarding its install location" ));
+
- checker.failed();
--
++// checker.failed();
+
- checker.getCheckInstance().cancel();
--
++// checker.getCheckInstance().cancel();
+
- return;
- }
--
++// return;
++// }
+
- String[] mirrors = versionGetter.getMirrors();
--
++// String[] mirrors = versionGetter.getMirrors();
+
- ResourceDownloader swtDownloader = null;
--
++// ResourceDownloader swtDownloader = null;
+
- ResourceDownloaderFactory factory = ResourceDownloaderFactoryImpl.getSingleton();
- List downloaders = new ArrayList();
- for(int i = 0 ; i < mirrors.length ; i++) {
@@ -136,31 +207,62 @@
- ResourceDownloader[] resourceDownloaders =
- (ResourceDownloader[])
- downloaders.toArray(new ResourceDownloader[downloaders.size()]);
--
++// ResourceDownloaderFactory factory = ResourceDownloaderFactoryImpl.getSingleton();
++// List downloaders = new ArrayList();
++// for(int i = 0 ; i < mirrors.length ; i++) {
++// try {
++// downloaders.add(factory.getSuffixBasedDownloader(factory.create(new URL(mirrors[i]))));
++// } catch(MalformedURLException e) {
++// //Do nothing
++// if (Logger.isEnabled())
++// Logger.log(new LogEvent(LOGID, LogEvent.LT_WARNING,
++// "Cannot use URL " + mirrors[i] + " (not valid)"));
++// }
++// }
++// ResourceDownloader[] resourceDownloaders =
++// (ResourceDownloader[])
++// downloaders.toArray(new ResourceDownloader[downloaders.size()]);
+
- swtDownloader = factory.getRandomDownloader(resourceDownloaders);
--
++// swtDownloader = factory.getRandomDownloader(resourceDownloaders);
+
- // get the size so its cached up
--
++// // get the size so its cached up
+
- try{
- swtDownloader.getSize();
--
++// try{
++// swtDownloader.getSize();
+
- }catch( ResourceDownloaderException e ){
--
++// }catch( ResourceDownloaderException e ){
+
- Debug.printStackTrace( e );
- }
--
++// Debug.printStackTrace( e );
++// }
+
- final Update update =
- checker.addUpdate("SWT Library for " + versionGetter.getPlatform(),
-- new String[] {"SWT is the graphical library used by Azureus"},
+- new String[] {"SWT is the graphical library used by " + Constants.APP_NAME},
- "" + versionGetter.getLatestVersion(),
- swtDownloader,
- Update.RESTART_REQUIRED_YES
- );
--
++// final Update update =
++// checker.addUpdate("SWT Library for " + versionGetter.getPlatform(),
++// new String[] {"SWT is the graphical library used by " + Constants.APP_NAME},
++// "" + versionGetter.getLatestVersion(),
++// swtDownloader,
++// Update.RESTART_REQUIRED_YES
++// );
+
- update.setDescriptionURL(versionGetter.getInfoURL());
--
++// update.setDescriptionURL(versionGetter.getInfoURL());
+
- swtDownloader.addListener(new ResourceDownloaderAdapter() {
--
++// swtDownloader.addListener(new ResourceDownloaderAdapter() {
+
- public boolean completed(ResourceDownloader downloader, InputStream data) {
- //On completion, process the InputStream to store temp files
- return processData(checker,update,downloader,data);
@@ -170,14 +272,26 @@
- }catch( Throwable e ){
- Logger.log(new LogAlert(LogAlert.UNREPEATABLE,
- "SWT Version check failed", e));
--
++// public boolean completed(ResourceDownloader downloader, InputStream data) {
++// //On completion, process the InputStream to store temp files
++// return processData(checker,update,downloader,data);
++// }
++// });
++// }
++// }catch( Throwable e ){
++// Logger.log(new LogAlert(LogAlert.UNREPEATABLE,
++// "SWT Version check failed", e));
+
- checker.failed();
--
++// checker.failed();
+
- }finally{
--
++// }finally{
+
- checker.completed();
- }
--
++// checker.completed();
++// }
+
}
- private boolean
azureus-no-update-manager-UpdateMonitor.patch:
UpdateMonitor.java | 221 +++++++++++++----------------------------------------
1 file changed, 57 insertions(+), 164 deletions(-)
Index: azureus-no-update-manager-UpdateMonitor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-update-manager-UpdateMonitor.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- azureus-no-update-manager-UpdateMonitor.patch 29 Jan 2008 16:02:38 -0000 1.7
+++ azureus-no-update-manager-UpdateMonitor.patch 5 Sep 2009 17:50:45 -0000 1.8
@@ -1,17 +1,27 @@
---- origorg/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2007-11-30 10:44:14.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2008-01-29 10:08:47.000000000 -0500
-@@ -89,70 +89,6 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor azureus-4.0.0.4/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java
+--- azureus-4.0.0.4/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor 2008-10-01 15:58:50.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2009-09-05 17:40:13.000000000 +0300
+@@ -99,66 +99,66 @@ public class UpdateMonitor
protected UpdateMonitor(AzureusCore _azureus_core) {
azCore = _azureus_core;
- PluginInterface defPI = azCore.getPluginManager().getDefaultPluginInterface();
- UpdateManager um = defPI.getUpdateManager();
--
++// PluginInterface defPI = azCore.getPluginManager().getDefaultPluginInterface();
++// UpdateManager um = defPI.getUpdateManager();
+
- um.addListener(new UpdateManagerListener() {
- public void checkInstanceCreated(UpdateCheckInstance instance) {
- instance.addListener(UpdateMonitor.this);
--
-- new updateStatusChanger(instance);
++// um.addListener(new UpdateManagerListener() {
++// public void checkInstanceCreated(UpdateCheckInstance instance) {
++// instance.addListener(UpdateMonitor.this);
+
+- if ( !instance.isLowNoise()){
++// if ( !instance.isLowNoise()){
+
+- new updateStatusChanger(instance);
+- }
- }
- });
-
@@ -61,17 +71,61 @@
- performAutoCheck(false);
- }
- });
--
-- // wait a bit before starting check to give rest of AZ time to initialise
-- new DelayedEvent("UpdateMon:wait", 2500, new AERunnable() {
-- public void runSupport() {
-- performAutoCheck(true);
-- }
-- });
- }
++// new updateStatusChanger(instance);
++// }
++// }
++// });
++
++// um.addVerificationListener(new UpdateManagerVerificationListener() {
++// public boolean acceptUnVerifiedUpdate(final Update update) {
++// UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
++// if (uiFunctions != null) {
++// String title = MessageText.getString(MSG_PREFIX
++// + "accept.unverified.title");
++// String text = MessageText.getString(MSG_PREFIX
++// + "accept.unverified.text", new String[] {
++// update.getName()
++// });
++// return uiFunctions.promptUser(title, text, new String[] {
++// MessageText.getString("Button.yes"),
++// MessageText.getString("Button.no")
++// }, 1, MSG_PREFIX + "accept.unverified",
++// MessageText.getString("MessageBoxWindow.nomoreprompting"), false,
++// 0) == 0;
++// }
++
++// return false;
++// }
++
++// public void verificationFailed(final Update update, final Throwable cause) {
++// final String cause_str = Debug.getNestedExceptionMessage(cause);
++// UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
++// if (uiFunctions != null) {
++// String title = MessageText.getString(MSG_PREFIX
++// + "verification.failed.title");
++// String text = MessageText.getString(MSG_PREFIX
++// + "verification.failed.text", new String[] {
++// update.getName(),
++// cause_str
++// });
++// uiFunctions.promptUser(title, text, new String[] {
++// MessageText.getString("Button.ok")
++// }, 0, null, null, false, 0);
++// }
++// }
++// });
++
++
++// SimpleTimer.addPeriodicEvent("UpdateMon:autocheck",
++// AUTO_UPDATE_CHECK_PERIOD, new TimerEventPerformer() {
++// public void perform(TimerEvent ev) {
++// performAutoCheck(false);
++// }
++// });
- protected class updateStatusChanger
-@@ -306,43 +242,6 @@
+ DelayedTask delayed_task =
+ UtilitiesImpl.addDelayedTask(
+@@ -380,43 +380,6 @@ public class UpdateMonitor
}
protected void performAutoCheck(final boolean start_of_day) {
@@ -115,7 +169,7 @@
}
public void
-@@ -352,76 +251,6 @@
+@@ -426,76 +389,6 @@ public class UpdateMonitor
final boolean isRecheck,
final UpdateCheckInstanceListener l )
{
azureus-no-updates-PluginInitializer.patch:
PluginInitializer.java | 51 ++++++++++++++++++++++---------------------------
1 file changed, 23 insertions(+), 28 deletions(-)
Index: azureus-no-updates-PluginInitializer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-updates-PluginInitializer.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-no-updates-PluginInitializer.patch 3 Dec 2007 17:03:21 -0000 1.3
+++ azureus-no-updates-PluginInitializer.patch 5 Sep 2009 17:50:45 -0000 1.4
@@ -1,6 +1,7 @@
---- ../azureus3orig/azureus3/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2007-12-03 10:07:11.000000000 -0500
-+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2007-12-03 10:27:39.000000000 -0500
-@@ -44,13 +44,8 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
+--- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer 2008-10-31 16:25:38.000000000 +0200
++++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2009-09-02 21:53:06.000000000 +0300
+@@ -44,13 +44,8 @@ import org.gudy.azureus2.core3.logging.*
import org.gudy.azureus2.plugins.*;
import org.gudy.azureus2.pluginsimpl.local.launch.PluginLauncherImpl;
import org.gudy.azureus2.pluginsimpl.local.ui.UIManagerImpl;
@@ -14,61 +15,87 @@
/**
* @author Olivier
-@@ -91,11 +86,6 @@
- "azbpsharehoster",
+@@ -95,12 +90,12 @@ PluginInitializer
"ShareHoster",
- "true" },
+ "true",
+ "false"},
- { PluginManagerDefaults.PID_PLUGIN_UPDATE_CHECKER,
- "org.gudy.azureus2.pluginsimpl.update.PluginUpdatePlugin",
- "azbppluginupdate",
- "PluginUpdate",
-- "true" },
- { PluginManagerDefaults.PID_CLIENT_ID,
- "com.aelitis.azureus.plugins.clientid.ClientIDPlugin",
- "azbpclientid",
-@@ -121,16 +111,6 @@
- "azbpmagnet",
+- "true",
+- "true"},
++// { PluginManagerDefaults.PID_PLUGIN_UPDATE_CHECKER,
++// "org.gudy.azureus2.pluginsimpl.update.PluginUpdatePlugin",
++// "azbppluginupdate",
++// "PluginUpdate",
++// "true",
++// "true"},
+ { PluginManagerDefaults.PID_UPNP,
+ "com.aelitis.azureus.plugins.upnp.UPnPPlugin",
+ "azbpupnp",
+@@ -125,18 +120,18 @@ PluginInitializer
"Magnet URI Handler",
- "true" },
+ "true",
+ "false"},
- { PluginManagerDefaults.PID_CORE_UPDATE_CHECKER,
- "org.gudy.azureus2.update.CoreUpdateChecker",
- "azbpcoreupdater",
- "CoreUpdater",
-- "true" },
+- "true",
+- "true"},
- { PluginManagerDefaults.PID_CORE_PATCH_CHECKER,
- "org.gudy.azureus2.update.CorePatchChecker",
- "azbpcorepatcher",
- "CorePatcher",
-- "true" },
+- "true",
+- "true"},
++// { PluginManagerDefaults.PID_CORE_UPDATE_CHECKER,
++// "org.gudy.azureus2.update.CoreUpdateChecker",
++// "azbpcoreupdater",
++// "CoreUpdater",
++// "true",
++// "true"},
++// { PluginManagerDefaults.PID_CORE_PATCH_CHECKER,
++// "org.gudy.azureus2.update.CorePatchChecker",
++// "azbpcorepatcher",
++// "CorePatcher",
++// "true",
++// "true"},
{ PluginManagerDefaults.PID_PLATFORM_CHECKER,
"org.gudy.azureus2.platform.PlatformManagerPluginDelegate",
"azplatform2",
-@@ -316,11 +296,7 @@
+@@ -420,11 +415,11 @@ PluginInitializer
core_operation = _core_operation;
- UpdateManagerImpl.getSingleton( azureus_core ); // initialise the update manager
--
++ // UpdateManagerImpl.getSingleton( azureus_core ); // initialise the update manager
+
plugin_manager = PluginManagerImpl.getSingleton( this );
--
+
- UpdaterUtils.checkBootstrapPlugins();
++ // UpdaterUtils.checkBootstrapPlugins();
}
- protected boolean
-@@ -946,16 +922,11 @@
-
+ protected void
+@@ -1122,8 +1117,8 @@ PluginInitializer
if ( load_failure != null ){
-
-- // don't complain about our internal one
--
+ plugin_interface.setAsFailed();
+
+- // don't complain about our internal one
- if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
--
- String msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
-
- Logger.log(new LogAlert(LogAlert.UNREPEATABLE, msg, load_failure));
++ // // don't complain about our internal one
++ // if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
+
+ String msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
+ LogAlert la;
+@@ -1136,7 +1131,7 @@ PluginInitializer
+ Logger.log(la);
- System.out.println( msg + " : " + load_failure);
+ System.out.println( msg + ": " + load_failure);
- }
++ // }
}
}
azureus-no-updates-PluginInterfaceImpl.patch:
PluginInterfaceImpl.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: azureus-no-updates-PluginInterfaceImpl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus-no-updates-PluginInterfaceImpl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-no-updates-PluginInterfaceImpl.patch 29 May 2006 16:02:45 -0000 1.3
+++ azureus-no-updates-PluginInterfaceImpl.patch 5 Sep 2009 17:50:45 -0000 1.4
@@ -1,6 +1,7 @@
---- org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig 2006-05-02 02:33:14.000000000 -0700
-+++ org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java 2006-05-12 09:58:07.000000000 -0700
-@@ -48,7 +48,6 @@
+diff -up azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.no-updates-PluginInterfaceImpl azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java
+--- azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.no-updates-PluginInterfaceImpl 2008-08-20 08:20:26.000000000 +0300
++++ azureus-4.0.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java 2009-09-03 20:35:39.000000000 +0300
+@@ -50,7 +50,6 @@ import org.gudy.azureus2.pluginsimpl.loc
import org.gudy.azureus2.pluginsimpl.local.ui.config.ParameterRepository;
import org.gudy.azureus2.pluginsimpl.local.ui.config.PluginConfigUIFactoryImpl;
import org.gudy.azureus2.pluginsimpl.local.utils.*;
@@ -8,12 +9,12 @@
import org.gudy.azureus2.plugins.ipc.IPCInterface;
import org.gudy.azureus2.plugins.ipfilter.IPFilter;
import org.gudy.azureus2.plugins.tracker.Tracker;
-@@ -412,7 +411,7 @@
+@@ -426,7 +425,7 @@ PluginInterfaceImpl
public UpdateManager
getUpdateManager()
{
- return( UpdateManagerImpl.getSingleton( initialiser.getAzureusCore()));
-+ return( null );
++ return( null );
}
- public PeerProtocolManager
+
Index: azureus.script
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus.script,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- azureus.script 1 Sep 2009 18:38:26 -0000 1.23
+++ azureus.script 5 Sep 2009 17:50:45 -0000 1.24
@@ -12,7 +12,6 @@ SCRIPT_VERSION=2
rm -rf $APPDIR/plugins
mkdir -p $APPDIR/plugins
pushd $APPDIR/plugins > /dev/null 2>&1
-
if ls /usr/share/azureus/plugins/* > /dev/null 2>&1;then
for pdir in /usr/share/azureus/plugins/*; do
ln -s $pdir .;
@@ -25,10 +24,12 @@ case $(uname -i) in
*64)
eval $(grep '^GRE_PATH=' /etc/gre.d/gre64.conf)
SWT=/usr/lib64/eclipse/swt.jar
+ LIBDIR=/usr/lib64
;;
*)
eval $(grep '^GRE_PATH=' /etc/gre.d/gre.conf)
SWT=/usr/lib/eclipse/swt.jar
+ LIBDIR=/usr/lib
;;
esac
MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:/usr/lib/eclipse/plugins/:/usr/lib/eclipse/:/usr/lib/ CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"
Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-11/azureus.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- azureus.spec 1 Sep 2009 18:38:26 -0000 1.76
+++ azureus.spec 5 Sep 2009 17:50:45 -0000 1.77
@@ -2,7 +2,7 @@
Name: azureus
Version: 4.0.0.4
-Release: 4%{?dist}
+Release: 6%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
License: GPLv2+
@@ -23,7 +23,7 @@ Patch2: azureus-cache-size.patch
Patch3: azureus-remove-manifest-classpath.patch
Patch9: azureus-no-shared-plugins.patch
Patch12: azureus-no-updates-PluginInitializer.patch
-#Patch13: azureus-no-updates-PluginInterfaceImpl.patch
+Patch13: azureus-no-updates-PluginInterfaceImpl.patch
Patch14: azureus-no-update-manager-AzureusCoreImpl.patch
Patch15: azureus-no-update-manager-CorePatchChecker.patch
Patch16: azureus-no-update-manager-CoreUpdateChecker.patch
@@ -77,16 +77,16 @@ advanced users.
%patch2 -p0
%patch3 -p0
%patch9 -p0
-#%patch12 -p0
-#%patch13 -p0
+%patch12 -p1 -b .no-updates-PluginInitializer
+%patch13 -p1 -b .no-updates-PluginInterfaceImpl
%patch14 -p0
%patch15 -p0
-#%patch16 -p0
-#%patch18 -p0
-#%patch19 -p0
-#%patch20 -p0
-#%patch22 -p0
-#%patch23 -p0
+%patch16 -p1 -b .no-update-manager-CoreUpdateChecker
+%patch18 -p1 -b .no-update-manager-PluginInstallerImpl
+%patch19 -p1 -b .no-update-manager-PluginUpdatePlugin
+%patch20 -p1 -b .no-update-manager-SWTUpdateChecker
+%patch22 -p1 -b .no-update-manager-UpdateMonitor
+#%patch23 -p1 -b .no-update-manager-PluginInstallerImpl-2
%patch27 -p0
%patch28 -p0
#%patch31 -p0
@@ -151,7 +151,6 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadi
install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/Azureus2.jar
# TODO: fix launcher to be multilib-safe
install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus
-sed --in-place "s:/usr/lib:%{_libdir}:g" $RPM_BUILD_ROOT%{_bindir}/azureus
#install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins
#install -pm 644 plugins/azplugins/azplugins_2.1.6.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_2.1.6.jar
@@ -212,6 +211,12 @@ fi
%{_datadir}/azureus
%changelog
+* Wed Sep 2 2009 David Juran <david at juran.se> - 4.0.0.4-6
+- revive the no-updates patches
+
+* Wed Sep 2 2009 David Juran <david at juran.se> - 4.0.0.4-5
+ - Fix SWT dir on x86_64 (Bz 515228)
+
* Tue Sep 1 2009 David Juran <david at juran.se> - 4.0.0.4-4
- fix start-script to work when /usr/share/azureus/plugins/ is empty
More information about the scm-commits
mailing list