rpms/eclipse-mylar/devel eclipse-mylar-createSocketworkaround.patch, NONE, 1.1 eclipse-mylar.spec, 1.5, 1.6

Andrew Overholt (overholt) fedora-extras-commits at redhat.com
Wed Apr 18 17:40:21 UTC 2007


Author: overholt

Update of /cvs/extras/rpms/eclipse-mylar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17583

Modified Files:
	eclipse-mylar.spec 
Added Files:
	eclipse-mylar-createSocketworkaround.patch 
Log Message:
* Wed Apr 18 2007 Andrew Overholt <overholt at redhat.com> 1.0-4
- Add workaround for missing method in GNU Classpath.


eclipse-mylar-createSocketworkaround.patch:

--- NEW FILE eclipse-mylar-createSocketworkaround.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.mylar.tasks.core
Index: src/org/eclipse/mylar/internal/tasks/core/SslProtocolSocketFactory.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.tasks.core/src/org/eclipse/mylar/internal/tasks/core/Attic/SslProtocolSocketFactory.java,v
retrieving revision 1.3
diff -u -r1.3 SslProtocolSocketFactory.java
--- src/org/eclipse/mylar/internal/tasks/core/SslProtocolSocketFactory.java	7 Dec 2006 04:38:20 -0000	1.3
+++ src/org/eclipse/mylar/internal/tasks/core/SslProtocolSocketFactory.java	18 Apr 2007 15:58:11 -0000
@@ -97,10 +97,10 @@
 			}
 
 		}
-
-		Socket socket = getSslContext().getSocketFactory().createSocket();
-		socket.bind(new InetSocketAddress(clientHost, clientPort));
-		socket.connect(new InetSocketAddress(remoteHost, remotePort), params.getConnectionTimeout());
+		
+		Socket socket = getSslContext().getSocketFactory().createSocket(remoteHost, remotePort, clientHost, clientPort);
+//		socket.bind(new InetSocketAddress(clientHost, clientPort));
+//		socket.connect(new InetSocketAddress(remoteHost, remotePort), params.getConnectionTimeout());
 		return socket;
 	}
 



Index: eclipse-mylar.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-mylar/devel/eclipse-mylar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-mylar.spec	12 Apr 2007 15:45:23 -0000	1.5
+++ eclipse-mylar.spec	18 Apr 2007 17:39:47 -0000	1.6
@@ -4,7 +4,7 @@
 Name: eclipse-mylar 
 Summary: Mylar is a task-focused UI for Eclipse
 Version: 1.0
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylar
 
@@ -24,6 +24,8 @@
 # environment - will file upstream
 Patch1: %{name}-web1.5.patch
 Patch2: %{name}-team1.5.patch
+# SSLSocketFactory#createSocket() is not implemented in GNU Classpath
+Patch3: %{name}-createSocketworkaround.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -208,6 +210,9 @@
 pushd org.eclipse.mylar.team
 %patch2 -p0
 popd
+pushd org.eclipse.mylar.tasks.core
+%patch3 -p0
+popd
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
 mkdir home
 
@@ -385,6 +390,9 @@
 %endif
 
 %changelog
+* Wed Apr 18 2007 Andrew Overholt <overholt at redhat.com> 1.0-4
+- Add workaround for missing method in GNU Classpath.
+
 * Thu Apr 12 2007 Andrew Overholt <overholt at redhat.com> 1.0-3
 - Add Obsoletes and Provides for eclipse-bugzilla on
   eclipse-mylar-bugzilla (comments in bug #222677).  If someone notices




More information about the scm-commits mailing list