bluecove-2.1.1-SNAPSHOT.patch 2.9 KB

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