Version 2.1.5-2.

1 files changed, 19 insertions, 11 deletions

diff --git a/bin.patch b/bin.patch
index 21c05fc4f900..ed3fbd7c7c10 100644
--- a/bin.patch
+++ b/bin.patch
@@ -1,6 +1,6 @@
-diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/bin/neo4j neo4j-community-2.1.3-mod/bin/neo4j
---- neo4j-community-2.1.3-orig/bin/neo4j	2014-07-24 10:16:30.000000000 -0300
-+++ neo4j-community-2.1.3-mod/bin/neo4j	2014-07-30 09:21:58.581917663 -0300
+diff -U 3 -H -d -r -N -- neo4j-community-2.1.5-orig/bin/neo4j neo4j-community-2.1.5-mod/bin/neo4j
+--- neo4j-community-2.1.5-orig/bin/neo4j	2014-09-30 03:35:40.000000000 -0300
++++ neo4j-community-2.1.5-mod/bin/neo4j	2014-11-05 07:57:26.549286965 -0200
 @@ -33,23 +33,12 @@
  LAUNCHD_NAME="org.neo4j.server"
  
@@ -77,7 +77,16 @@ diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/bin/neo4j neo4j-community-2.
  }
  
  detectrunning() {
-@@ -289,16 +278,16 @@
+@@ -144,7 +133,7 @@
+   else
+       ## This could be achieved with filtering using -sTCP:LISTEN but this option is not available
+       ## on lsof v4.78 which is the one bundled with some distros. So we have to do this grep below
+-      newpid=$(lsof -i :$NEO4J_SERVER_PORT -F T -Ts | grep -i "TST=LISTEN" -B1 | head -n1)
++      newpid=$(lsof -i :$NEO4J_SERVER_PORT -F p | grep "p")
+       newpid=${newpid:1}
+   fi
+ }
+@@ -289,15 +278,15 @@
  # pass in "true" for created to mark that the user was created (instead than pre-existing)
  modify_user_config() {
    created=${2:-"false"}
@@ -99,10 +108,9 @@ diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/bin/neo4j neo4j-community-2.
 +    echo "wrapper.user.created=${created}" >> "$NEO4J_CONFIG/neo4j-wrapper.conf"
    fi
  }
- 
-diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/bin/neo4j-shell neo4j-community-2.1.3-mod/bin/neo4j-shell
---- neo4j-community-2.1.3-orig/bin/neo4j-shell	2014-07-24 10:16:30.000000000 -0300
-+++ neo4j-community-2.1.3-mod/bin/neo4j-shell	2014-07-30 09:39:15.685405615 -0300
+diff -U 3 -H -d -r -N -- neo4j-community-2.1.5-orig/bin/neo4j-shell neo4j-community-2.1.5-mod/bin/neo4j-shell
+--- neo4j-community-2.1.5-orig/bin/neo4j-shell	2014-09-30 03:35:40.000000000 -0300
++++ neo4j-community-2.1.5-mod/bin/neo4j-shell	2014-11-05 07:39:00.153752030 -0200
 @@ -86,7 +86,7 @@
  
  if [ -z "$REPO" ]
@@ -112,9 +120,9 @@ diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/bin/neo4j-shell neo4j-commun
  fi
  
  LIBRARY_JARS=""
-diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/bin/utils neo4j-community-2.1.3-mod/bin/utils
---- neo4j-community-2.1.3-orig/bin/utils	2014-07-24 10:16:30.000000000 -0300
-+++ neo4j-community-2.1.3-mod/bin/utils	2014-07-30 09:42:28.360468307 -0300
+diff -U 3 -H -d -r -N -- neo4j-community-2.1.5-orig/bin/utils neo4j-community-2.1.5-mod/bin/utils
+--- neo4j-community-2.1.5-orig/bin/utils	2014-09-30 03:35:40.000000000 -0300
++++ neo4j-community-2.1.5-mod/bin/utils	2014-11-05 07:39:00.153752030 -0200
 @@ -324,11 +324,11 @@
  # in place.
  checkandrepairenv() {