diff options
author | Marcel Campello Ferreira | 2014-11-05 11:06:32 -0200 |
---|---|---|
committer | Marcel Campello Ferreira | 2014-11-05 11:06:32 -0200 |
commit | fe7f0ef6ad722156332cc646e6f2f422a259a86f (patch) | |
tree | e963f76384c46ef9f987f3ec8ad3e43333191fb4 | |
parent | 267a92a9e521cc677e7004d8374297b2f9d61b79 (diff) | |
download | aur-fe7f0ef6ad722156332cc646e6f2f422a259a86f.tar.gz |
Version 2.1.5-2.
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 16 | ||||
-rw-r--r-- | bin.patch | 30 | ||||
-rw-r--r-- | conf.patch | 24 | ||||
-rw-r--r-- | neo4j.install | 35 |
5 files changed, 69 insertions, 44 deletions
@@ -1,7 +1,7 @@ pkgbase = neo4j pkgdesc = A fully transactional graph database implemented in Java pkgver = 2.1.5 - pkgrel = 1 + pkgrel = 2 url = http://neo4j.org/ install = neo4j.install arch = any @@ -24,9 +24,9 @@ pkgbase = neo4j source = neo4j.service source = neo4j-tmpfile.conf sha256sums = 00bf0c9cc581f43ce8724cf4f5ae275cc6d0cb5dc96945ac6dff2859bb874b40 - sha256sums = 61e36b7695cc214d192de6d8c81c68fadd7dab90394eb2cd94fd8c916da5fc77 - sha256sums = e5fe9c34ff9052be68bb66acbdf04cc2e3dfd18cfdc62d78d01688d72dd55773 - sha256sums = 60863d1da348dd07ac7c321c51819596f73bb326cb686b85661e1165daea86e9 + sha256sums = e52e0f353ce80e09fe74662e77223f5ff35a36f874653795ad173aa8a6bd5525 + sha256sums = 63426ed3ee522c2ce5f1505b15502742187156c9f09b3b1e8b2eff2379fa2a89 + sha256sums = 28bcec6540196eaf89698e8dd4577f7b0cb0e4393d8715ff8b86ad5f700bcb60 sha256sums = ee451a5b4ac3f733ab725bb3babeefc4d852115fe24ee29a3060922716212ad7 sha256sums = e9ecbf86072ca92129ab1889b5f91e2494b86e84248bd15a37681a3997892d7d @@ -1,7 +1,7 @@ -# Maintainer: Marcel Campello Ferreira <tucho.tijucano@gmail.com> +# Maintainer: Marcel Campello Ferreira <marcel@prafrentex.com.br> pkgname=neo4j pkgver=2.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="A fully transactional graph database implemented in Java" arch=(any) url="http://neo4j.org/" @@ -22,12 +22,12 @@ source=(http://dist.neo4j.org/neo4j-community-$pkgver-unix.tar.gz neo4j.install neo4j.service neo4j-tmpfile.conf) -sha256sums=(00bf0c9cc581f43ce8724cf4f5ae275cc6d0cb5dc96945ac6dff2859bb874b40 - 61e36b7695cc214d192de6d8c81c68fadd7dab90394eb2cd94fd8c916da5fc77 - e5fe9c34ff9052be68bb66acbdf04cc2e3dfd18cfdc62d78d01688d72dd55773 - 60863d1da348dd07ac7c321c51819596f73bb326cb686b85661e1165daea86e9 - ee451a5b4ac3f733ab725bb3babeefc4d852115fe24ee29a3060922716212ad7 - e9ecbf86072ca92129ab1889b5f91e2494b86e84248bd15a37681a3997892d7d) +sha256sums=('00bf0c9cc581f43ce8724cf4f5ae275cc6d0cb5dc96945ac6dff2859bb874b40' + 'e52e0f353ce80e09fe74662e77223f5ff35a36f874653795ad173aa8a6bd5525' + '63426ed3ee522c2ce5f1505b15502742187156c9f09b3b1e8b2eff2379fa2a89' + '28bcec6540196eaf89698e8dd4577f7b0cb0e4393d8715ff8b86ad5f700bcb60' + 'ee451a5b4ac3f733ab725bb3babeefc4d852115fe24ee29a3060922716212ad7' + 'e9ecbf86072ca92129ab1889b5f91e2494b86e84248bd15a37681a3997892d7d') prepare() { 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() { diff --git a/conf.patch b/conf.patch index 21bca1054201..6897895a81bb 100644 --- a/conf.patch +++ b/conf.patch @@ -1,6 +1,6 @@ -diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/conf/logging.properties neo4j-community-2.1.3-mod/conf/logging.properties ---- neo4j-community-2.1.3-orig/conf/logging.properties 2014-07-24 10:16:30.000000000 -0300 -+++ neo4j-community-2.1.3-mod/conf/logging.properties 2014-07-30 09:44:52.691749854 -0300 +diff -U 3 -H -d -r -N -- neo4j-community-2.1.5-orig/conf/logging.properties neo4j-community-2.1.5-mod/conf/logging.properties +--- neo4j-community-2.1.5-orig/conf/logging.properties 2014-09-30 03:35:40.000000000 -0300 ++++ neo4j-community-2.1.5-mod/conf/logging.properties 2014-11-05 07:38:53.457072034 -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 -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/conf/logging.properties neo4 # Specifies whether the FileHandler should append onto any existing files # (defaults to false): -diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/conf/neo4j-http-logging.xml neo4j-community-2.1.3-mod/conf/neo4j-http-logging.xml ---- neo4j-community-2.1.3-orig/conf/neo4j-http-logging.xml 2014-07-24 10:16:30.000000000 -0300 -+++ neo4j-community-2.1.3-mod/conf/neo4j-http-logging.xml 2014-07-30 09:45:44.372206150 -0300 +diff -U 3 -H -d -r -N -- neo4j-community-2.1.5-orig/conf/neo4j-http-logging.xml neo4j-community-2.1.5-mod/conf/neo4j-http-logging.xml +--- neo4j-community-2.1.5-orig/conf/neo4j-http-logging.xml 2014-09-30 03:35:40.000000000 -0300 ++++ neo4j-community-2.1.5-mod/conf/neo4j-http-logging.xml 2014-11-05 07:38:53.457072034 -0200 @@ -21,9 +21,9 @@ --> <configuration> @@ -25,9 +25,9 @@ diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/conf/neo4j-http-logging.xml <maxHistory>30</maxHistory> </rollingPolicy> -diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/conf/neo4j-server.properties neo4j-community-2.1.3-mod/conf/neo4j-server.properties ---- neo4j-community-2.1.3-orig/conf/neo4j-server.properties 2014-07-24 10:16:30.000000000 -0300 -+++ neo4j-community-2.1.3-mod/conf/neo4j-server.properties 2014-07-30 09:48:17.506884800 -0300 +diff -U 3 -H -d -r -N -- neo4j-community-2.1.5-orig/conf/neo4j-server.properties neo4j-community-2.1.5-mod/conf/neo4j-server.properties +--- neo4j-community-2.1.5-orig/conf/neo4j-server.properties 2014-09-30 03:35:40.000000000 -0300 ++++ neo4j-community-2.1.5-mod/conf/neo4j-server.properties 2014-11-05 07:38:53.457072034 -0200 @@ -8,7 +8,7 @@ #*************************************************************** @@ -80,9 +80,9 @@ diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/conf/neo4j-server.properties -org.neo4j.server.http.log.config=conf/neo4j-http-logging.xml +org.neo4j.server.http.log.config=/etc/neo4j/neo4j-http-logging.xml -diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/conf/neo4j-wrapper.conf neo4j-community-2.1.3-mod/conf/neo4j-wrapper.conf ---- neo4j-community-2.1.3-orig/conf/neo4j-wrapper.conf 2014-07-24 10:16:30.000000000 -0300 -+++ neo4j-community-2.1.3-mod/conf/neo4j-wrapper.conf 2014-07-30 10:48:48.062984108 -0300 +diff -U 3 -H -d -r -N -- neo4j-community-2.1.5-orig/conf/neo4j-wrapper.conf neo4j-community-2.1.5-mod/conf/neo4j-wrapper.conf +--- neo4j-community-2.1.5-orig/conf/neo4j-wrapper.conf 2014-09-30 03:35:40.000000000 -0300 ++++ neo4j-community-2.1.5-mod/conf/neo4j-wrapper.conf 2014-11-05 07:38:53.457072034 -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 diff --git a/neo4j.install b/neo4j.install index c5f27165706e..8977e5fb6eec 100644 --- a/neo4j.install +++ b/neo4j.install @@ -34,17 +34,34 @@ assert_user_and_group_exist() { } warn_about_java_home() { - echo "------------------------------" - echo "--- ACHTUNG ACHTUNG ALARM! ---" - echo "------------------------------" - echo "Before starting the Neo4j service, create this file" + echo "---------------" + echo "--- HOORAY!! --" + echo "---------------" + echo "If it is the first time you install Neo4j in your" + echo "Arch box, that's it, you are done. Enjoy your graphs" + echo "and please disregard all that is said from now on..." echo "" - echo "/etc/systemd/system/neo4j.service.d/java_home.conf" + echo "If you are upgrading Neo4j from a previous version and" + echo "were given the following advice:" echo "" - echo "with the following content:" + echo " >> ------------------------------" + echo " >> --- ACHTUNG ACHTUNG ALARM! ---" + echo " >> ------------------------------" + echo " >> Before starting the Neo4j service, create this file" + echo " >> " + echo " >> /etc/systemd/system/neo4j.service.d/java_home.conf" + echo " >> " + echo " >> with the following content:" + echo " >> " + echo " >> [Service]" + echo " >> Environment=JAVA_HOME=/your/java/home/path" + echo " >> " + echo " >> changing '/your/java/home/path' to your actual JAVA_HOME path." echo "" - echo "[Service]" - echo "Environment=JAVA_HOME=/your/java/home/path" + echo "then now you are free to delete that file. Actually," + echo "pursuant to the new Arch's Java Way of Life" + echo "(https://wiki.archlinux.org/index.php/Java#Former_.22One_time_setup.22_trick)" + echo "you shall delete it. Thereupon, enjoy your graphs." echo "" - echo "changing '/your/java/home/path' to your actual JAVA_HOME path." + echo "This message will self-destruct in 3 s̶e̶c̶o̶n̶d̶s̶ releases..." } |