bluecove-2.1.1-SNAPSHOT.patch 2.86 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
diff -Bbur bluecove-2.1.1-SNAPSHOT/bluecove/pom.xml bluecove-2.1.1-SNAPSHOT-briar/bluecove/pom.xml
--- bluecove-2.1.1-SNAPSHOT/bluecove/pom.xml	2013-01-04 00:43:17.961294408 +0000
+++ bluecove-2.1.1-SNAPSHOT-briar/bluecove/pom.xml	2013-01-03 23:17:37.549293571 +0000
@@ -126,8 +126,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.3</source>
-                    <target>1.1</target>
+                    <source>1.5</source>
+                    <target>1.5</target>
                 </configuration>
             </plugin>
 
@@ -355,7 +355,7 @@
                 <configuration>
                     <linkXref>true</linkXref>
                     <minimumTokens>100</minimumTokens>
-                    <targetJdk>1.4</targetJdk>
+                    <targetJdk>1.5</targetJdk>
                 </configuration>
             </plugin>
             <plugin>
diff -Bbur bluecove-2.1.1-SNAPSHOT/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm bluecove-2.1.1-SNAPSHOT-briar/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm
--- bluecove-2.1.1-SNAPSHOT/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm	2013-01-04 00:43:17.549293781 +0000
+++ bluecove-2.1.1-SNAPSHOT-briar/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm	2013-01-03 23:19:02.269295705 +0000
@@ -280,6 +280,10 @@
 	    ndebug(("fail to get IOBluetoothRFCOMMChannel"));
 	    return;
 	}
+        if(![rfcommChannel isIncoming]) {
+            ndebug(("ignoring outgoing connection"));
+            return;
+        }
 	if (comm->authenticate) {
 	    IOBluetoothDevice* device = [rfcommChannel getDevice];
 	    if (device == NULL) {
diff -Bbur bluecove-2.1.1-SNAPSHOT/bluecove-gpl/pom.xml bluecove-2.1.1-SNAPSHOT-briar/bluecove-gpl/pom.xml
--- bluecove-2.1.1-SNAPSHOT/bluecove-gpl/pom.xml	2013-01-04 00:43:14.509294005 +0000
+++ bluecove-2.1.1-SNAPSHOT-briar/bluecove-gpl/pom.xml	2013-01-03 23:17:52.181293751 +0000
@@ -81,8 +81,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.3</source>
-                    <target>1.1</target>
+                    <source>1.5</source>
+                    <target>1.5</target>
                 </configuration>
             </plugin>
 
diff -Bbur bluecove-2.1.1-SNAPSHOT/pom.xml bluecove-2.1.1-SNAPSHOT-briar/pom.xml
--- bluecove-2.1.1-SNAPSHOT/pom.xml	2013-01-04 00:43:19.721293788 +0000
+++ bluecove-2.1.1-SNAPSHOT-briar/pom.xml	2013-01-03 23:17:18.713293930 +0000
@@ -436,7 +436,7 @@
                 <configuration>
                     <linkXref>true</linkXref>
                     <minimumTokens>100</minimumTokens>
-                    <targetJdk>1.4</targetJdk>
+                    <targetJdk>1.5</targetJdk>
                 </configuration>
             </plugin>
             <plugin>