Version 2.0.1-1.

5 files changed, 70 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bcd21efbc8c..9a44a9a8444e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = neo4j
 	pkgdesc = A fully transactional graph database implemented in Java
-	pkgver = 2.0.0
-	pkgrel = 2
+	pkgver = 2.0.1
+	pkgrel = 1
 	url = http://neo4j.org/
 	install = neo4j.install
 	arch = any
@@ -16,16 +16,16 @@ pkgbase = neo4j
 	backup = etc/neo4j/neo4j-server.properties
 	backup = etc/neo4j/neo4j-wrapper.conf
 	backup = etc/neo4j/neo4j.properties
-	source = http://dist.neo4j.org/neo4j-community-2.0.0-unix.tar.gz
+	source = http://dist.neo4j.org/neo4j-community-2.0.1-unix.tar.gz
 	source = bin.patch
 	source = conf.patch
 	source = neo4j.install
 	source = neo4j.service
 	source = neo4j-tmpfile.conf
-	sha256sums = 44a7160ead5cf70a385cceed30f7e999e29047b39ca92ac346bd230e2767f2ff
-	sha256sums = 3b7dfe7448e82a7be4dfa31d1d30aa3921a483c6a33926800664af3bef25e3d2
-	sha256sums = d230ccb4d2ddd7bc504d729c50170c39acc8f16815168f99b82f4d7fdd07b094
-	sha256sums = 6af4ac963343f8d88c2a10361391eea113737a2383eed3fbba26c89e548d4d66
+	sha256sums = 3ec7b33c198361d113fd6674afcac9b1195ae2434f5b4bb19b3825e2fe0b0862
+	sha256sums = 870d0fe93a07053df8edcee32c5638414336116a2a26531fa689e849032fdf9e
+	sha256sums = 47f7648c0d609d363ae8e4ad5317a7f37f7625c4ac05a356d2d41a9bfbde495a
+	sha256sums = 7cec057ea41df6333389ef5d9654fa7769ea141dbe5da5bf1b526c6de292e22f
 	sha256sums = 27e044354f10cb4c844b827442850326d900bc40e01443dbc0cd446bd057af27
 	sha256sums = e9ecbf86072ca92129ab1889b5f91e2494b86e84248bd15a37681a3997892d7d
 
diff --git a/PKGBUILD b/PKGBUILD
index 8f37d72f50cc..fd9db80ed7c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Marcel Campello Ferreira <tucho.tijucano@gmail.com>
 pkgname=neo4j
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.0.1
+pkgrel=1
 pkgdesc="A fully transactional graph database implemented in Java"
 arch=(any)
 url="http://neo4j.org/"
@@ -21,10 +21,10 @@ source=(http://dist.neo4j.org/neo4j-community-$pkgver-unix.tar.gz
 	neo4j.install
 	neo4j.service
 	neo4j-tmpfile.conf)
-sha256sums=(44a7160ead5cf70a385cceed30f7e999e29047b39ca92ac346bd230e2767f2ff
-	    3b7dfe7448e82a7be4dfa31d1d30aa3921a483c6a33926800664af3bef25e3d2
-	    d230ccb4d2ddd7bc504d729c50170c39acc8f16815168f99b82f4d7fdd07b094
-	    6af4ac963343f8d88c2a10361391eea113737a2383eed3fbba26c89e548d4d66
+sha256sums=(3ec7b33c198361d113fd6674afcac9b1195ae2434f5b4bb19b3825e2fe0b0862
+	    870d0fe93a07053df8edcee32c5638414336116a2a26531fa689e849032fdf9e
+	    47f7648c0d609d363ae8e4ad5317a7f37f7625c4ac05a356d2d41a9bfbde495a
+	    7cec057ea41df6333389ef5d9654fa7769ea141dbe5da5bf1b526c6de292e22f
 	    27e044354f10cb4c844b827442850326d900bc40e01443dbc0cd446bd057af27
 	    e9ecbf86072ca92129ab1889b5f91e2494b86e84248bd15a37681a3997892d7d)
 
diff --git a/bin.patch b/bin.patch
index 8139c5c04dea..47332bc262f8 100644
--- a/bin.patch
+++ b/bin.patch
@@ -1,6 +1,6 @@
-diff -Naur neo4j-community-2.0.0.orig/bin/neo4j neo4j-community-2.0.0/bin/neo4j
---- neo4j-community-2.0.0.orig/bin/neo4j	2013-12-08 13:51:51.000000000 -0200
-+++ neo4j-community-2.0.0/bin/neo4j	2013-12-20 16:15:21.365783596 -0200
+diff -Naur neo4j-community-2.0.1.orig/bin/neo4j neo4j-community-2.0.1/bin/neo4j
+--- neo4j-community-2.0.1.orig/bin/neo4j	2014-02-03 12:27:28.000000000 -0200
++++ neo4j-community-2.0.1/bin/neo4j	2014-02-06 11:19:45.627080264 -0200
 @@ -46,10 +46,11 @@
      cd "$(dirname "$SCRIPT")"
      SCRIPT=`basename "$SCRIPT"`
@@ -86,9 +86,9 @@ diff -Naur neo4j-community-2.0.0.orig/bin/neo4j neo4j-community-2.0.0/bin/neo4j
    fi
  }
  
-diff -Naur neo4j-community-2.0.0.orig/bin/neo4j-shell neo4j-community-2.0.0/bin/neo4j-shell
---- neo4j-community-2.0.0.orig/bin/neo4j-shell	2013-12-08 13:51:51.000000000 -0200
-+++ neo4j-community-2.0.0/bin/neo4j-shell	2014-01-06 16:03:05.279834973 -0200
+diff -Naur neo4j-community-2.0.1.orig/bin/neo4j-shell neo4j-community-2.0.1/bin/neo4j-shell
+--- neo4j-community-2.0.1.orig/bin/neo4j-shell	2014-02-03 12:27:28.000000000 -0200
++++ neo4j-community-2.0.1/bin/neo4j-shell	2014-02-06 11:23:15.362633139 -0200
 @@ -86,7 +86,7 @@
  
  if [ -z "$REPO" ]
@@ -98,9 +98,9 @@ diff -Naur neo4j-community-2.0.0.orig/bin/neo4j-shell neo4j-community-2.0.0/bin/
  fi
  
  LIBRARY_JARS=""
-diff -Naur neo4j-community-2.0.0.orig/bin/utils neo4j-community-2.0.0/bin/utils
---- neo4j-community-2.0.0.orig/bin/utils	2013-12-08 13:51:51.000000000 -0200
-+++ neo4j-community-2.0.0/bin/utils	2013-12-20 15:14:26.613409008 -0200
+diff -Naur neo4j-community-2.0.1.orig/bin/utils neo4j-community-2.0.1/bin/utils
+--- neo4j-community-2.0.1.orig/bin/utils	2014-02-03 12:27:28.000000000 -0200
++++ neo4j-community-2.0.1/bin/utils	2014-02-06 11:28:38.775733143 -0200
 @@ -325,11 +325,11 @@
  # in place.
  checkandrepairenv() {
diff --git a/conf.patch b/conf.patch
index 71b764ec52e6..805a17297356 100644
--- a/conf.patch
+++ b/conf.patch
@@ -1,6 +1,6 @@
-diff -Naur neo4j-community-2.0.0.orig/conf/logging.properties neo4j-community-2.0.0/conf/logging.properties
---- neo4j-community-2.0.0.orig/conf/logging.properties	2013-12-08 13:51:51.000000000 -0200
-+++ neo4j-community-2.0.0/conf/logging.properties	2013-12-19 14:01:10.531945416 -0200
+diff -Naur neo4j-community-2.0.1.orig/conf/logging.properties neo4j-community-2.0.1/conf/logging.properties
+--- neo4j-community-2.0.1.orig/conf/logging.properties	2014-02-03 12:27:28.000000000 -0200
++++ neo4j-community-2.0.1/conf/logging.properties	2014-02-06 14:16:01.912344474 -0200
 @@ -51,7 +51,7 @@
  #    "%g" the generation number to distinguish rotated logs
  #    "%u" a unique number to resolve conflicts
@@ -10,9 +10,9 @@ diff -Naur neo4j-community-2.0.0.orig/conf/logging.properties neo4j-community-2.
  
  # Specifies whether the FileHandler should append onto any existing files
  # (defaults to false):
-diff -Naur neo4j-community-2.0.0.orig/conf/neo4j-http-logging.xml neo4j-community-2.0.0/conf/neo4j-http-logging.xml
---- neo4j-community-2.0.0.orig/conf/neo4j-http-logging.xml	2013-12-08 13:51:51.000000000 -0200
-+++ neo4j-community-2.0.0/conf/neo4j-http-logging.xml	2013-12-19 14:01:55.355564433 -0200
+diff -Naur neo4j-community-2.0.1.orig/conf/neo4j-http-logging.xml neo4j-community-2.0.1/conf/neo4j-http-logging.xml
+--- neo4j-community-2.0.1.orig/conf/neo4j-http-logging.xml	2014-02-03 12:27:28.000000000 -0200
++++ neo4j-community-2.0.1/conf/neo4j-http-logging.xml	2014-02-06 14:17:08.212877706 -0200
 @@ -21,9 +21,9 @@
  -->
  <configuration>
@@ -25,9 +25,9 @@ diff -Naur neo4j-community-2.0.0.orig/conf/neo4j-http-logging.xml neo4j-communit
        <maxHistory>30</maxHistory>
      </rollingPolicy>
  
-diff -Naur neo4j-community-2.0.0.orig/conf/neo4j-server.properties neo4j-community-2.0.0/conf/neo4j-server.properties
---- neo4j-community-2.0.0.orig/conf/neo4j-server.properties	2013-12-08 13:51:51.000000000 -0200
-+++ neo4j-community-2.0.0/conf/neo4j-server.properties	2013-12-19 14:04:32.996949681 -0200
+diff -Naur neo4j-community-2.0.1.orig/conf/neo4j-server.properties neo4j-community-2.0.1/conf/neo4j-server.properties
+--- neo4j-community-2.0.1.orig/conf/neo4j-server.properties	2014-02-03 12:27:28.000000000 -0200
++++ neo4j-community-2.0.1/conf/neo4j-server.properties	2014-02-06 14:20:53.928029987 -0200
 @@ -8,7 +8,7 @@
  #***************************************************************
  
@@ -80,9 +80,9 @@ diff -Naur neo4j-community-2.0.0.orig/conf/neo4j-server.properties neo4j-communi
 -org.neo4j.server.http.log.config=conf/neo4j-http-logging.xml
 +org.neo4j.server.http.log.config=/etc/neo4j/neo4j-http-logging.xml
  
-diff -Naur neo4j-community-2.0.0.orig/conf/neo4j-wrapper.conf neo4j-community-2.0.0/conf/neo4j-wrapper.conf
---- neo4j-community-2.0.0.orig/conf/neo4j-wrapper.conf	2013-12-08 13:51:51.000000000 -0200
-+++ neo4j-community-2.0.0/conf/neo4j-wrapper.conf	2013-12-20 14:26:22.470030601 -0200
+diff -Naur neo4j-community-2.0.1.orig/conf/neo4j-wrapper.conf neo4j-community-2.0.1/conf/neo4j-wrapper.conf
+--- neo4j-community-2.0.1.orig/conf/neo4j-wrapper.conf	2014-02-03 12:27:28.000000000 -0200
++++ neo4j-community-2.0.1/conf/neo4j-wrapper.conf	2014-02-06 14:25:22.523534328 -0200
 @@ -1,6 +1,6 @@
 -wrapper.java.additional=-Dorg.neo4j.server.properties=conf/neo4j-server.properties
 -wrapper.java.additional=-Djava.util.logging.config.file=conf/logging.properties
@@ -102,18 +102,16 @@ diff -Naur neo4j-community-2.0.0.orig/conf/neo4j-wrapper.conf neo4j-community-2.
  #wrapper.java.additional=-XX:+PrintGCDetails
  #wrapper.java.additional=-XX:+PrintGCDateStamps
  #wrapper.java.additional=-XX:+PrintGCApplicationStoppedTime
-@@ -26,8 +26,8 @@
+@@ -32,7 +32,7 @@
  # Wrapper settings
  #********************************************************************
- # Override default pidfile and lockfile 
--#wrapper.pidfile=../data/neo4j-server.pid
--#wrapper.lockfile=../data/neo4j-server.lck
-+#wrapper.pidfile=/var/lib/neo4j/data/neo4j-server.pid
-+#wrapper.lockfile=/var/lib/neo4j/data/neo4j-server.lck
+ # path is relative to the bin dir
+-wrapper.pidfile=../data/neo4j-server.pid
++wrapper.pidfile=/var/lib/neo4j/data/neo4j-server.pid
  
  #********************************************************************
  # Wrapper Windows NT/2000/XP Service Properties
-@@ -42,5 +42,5 @@
+@@ -47,5 +47,5 @@
  
  # User account to be used for linux installs. Will default to current
  # user if not set.
diff --git a/neo4j.install b/neo4j.install
index fbe06d3eb0a4..97733e3ed09a 100644
--- a/neo4j.install
+++ b/neo4j.install
@@ -1,28 +1,31 @@
- post_install() {
-   if ! getent group neo4j >/dev/null; then
-     groupadd --system neo4j
-   fi
-   if ! getent passwd neo4j >/dev/null; then
-     useradd --system -g neo4j -d /var/lib/neo4j -s /bin/false neo4j
-   fi
-   
-   chown -R neo4j.neo4j /var/lib/neo4j
-   chown -R neo4j.neo4j /var/log/neo4j
-   chown -R neo4j.neo4j /etc/neo4j
-   
-   /usr/bin/systemd-tmpfiles --create neo4j.conf
- }
- 
- post_upgrade() {
-   post_install $1
- }
- 
- post_remove() {
-   if getent passwd neo4j >/dev/null; then
-     userdel neo4j
-   fi   
-   if getent group neo4j >/dev/null; then
-     groupdel neo4j
-   fi
- }
- 
\ No newline at end of file
+assert_user_and_group_exist() {
+  if ! getent group neo4j >/dev/null; then
+    groupadd --system neo4j
+  fi
+  if ! getent passwd neo4j >/dev/null; then
+    useradd --system -g neo4j -d /var/lib/neo4j -s /bin/false neo4j
+  fi
+}
+
+post_install() {
+  assert_user_and_group_exist
+
+  chown -R neo4j.neo4j /var/lib/neo4j
+  chown -R neo4j.neo4j /var/log/neo4j
+  chown -R neo4j.neo4j /etc/neo4j
+
+  /usr/bin/systemd-tmpfiles --create neo4j.conf
+}
+
+post_upgrade() {
+  assert_user_and_group_exist
+}
+
+post_remove() {
+  if getent passwd neo4j >/dev/null; then
+    userdel neo4j
+  fi
+  if getent group neo4j >/dev/null; then
+    groupdel neo4j
+  fi
+}