git: 9f549708bd2b - main - databases/neo4j: Update to 4.4.7

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Wen Heping <wen_at_FreeBSD.org>
Date: Fri, 20 May 2022 02:20:15 UTC
The branch main has been updated by wen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9f549708bd2bc5bcb720e0c355aeda896ad5d653

commit 9f549708bd2bc5bcb720e0c355aeda896ad5d653
Author:     Wen Heping <wen@FreeBSD.org>
AuthorDate: 2022-05-20 02:19:43 +0000
Commit:     Wen Heping <wen@FreeBSD.org>
CommitDate: 2022-05-20 02:19:43 +0000

    databases/neo4j: Update to 4.4.7
---
 databases/neo4j/Makefile                     |  8 ++-
 databases/neo4j/distinfo                     |  6 +--
 databases/neo4j/files/patch-bin_cypher-shell |  2 +-
 databases/neo4j/files/patch-bin_neo4j        | 53 +++++++++---------
 databases/neo4j/files/patch-bin_neo4j-admin  | 46 ++++++----------
 databases/neo4j/files/patch-conf_neo4j.conf  | 19 +++----
 databases/neo4j/pkg-plist                    | 80 +++++++++++++++-------------
 7 files changed, 102 insertions(+), 112 deletions(-)

diff --git a/databases/neo4j/Makefile b/databases/neo4j/Makefile
index b9aa2d4c5067..f4e0d5b2842f 100644
--- a/databases/neo4j/Makefile
+++ b/databases/neo4j/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	neo4j
-DISTVERSION=	4.2.16
+DISTVERSION=	4.4.7
 CATEGORIES=	databases java
 MASTER_SITES=	http://dist.neo4j.org/
 DISTNAME=	${PORTNAME}-community-${DISTVERSION}-unix
@@ -26,12 +26,17 @@ PLIST_SUB=	DBDIR=${DBDIR} DISTVERSION=${DISTVERSION}
 DBDIR=		${DESTDIR}/var/db/${PORTNAME}
 LOGDIR=		${DESTDIR}/var/log/${PORTNAME}
 RUNDIR=		${DESTDIR}/var/run/
+NEO4JDIR=	${PREFIX}/${PORTNAME}
+NEO4J_CONFDIR=	${PREFIX}/etc
 
 post-patch:
 	${REINPLACE_CMD} 's,%%DBDIR%%,${DBDIR},g;s,%%JAVA_HOME%%,${JAVA_HOME},g;s,%%LOGDIR%%,${LOGDIR},g;s,%%PREFIX%%,${PREFIX},g;s,%%RUNDIR%%,${RUNDIR},g' \
 		${WRKSRC}/bin/cypher-shell ${WRKSRC}/bin/neo4j* \
 		${WRKSRC}/conf/neo4j.conf
 
+	${REINPLACE_CMD} 's,%%NEO4JDIR%%,${NEO4JDIR},g;s,%%NEO4J_CONFDIR%%,${NEO4J_CONFDIR},g' \
+		${WRKSRC}/bin/neo4j
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/tools
@@ -47,4 +52,5 @@ do-install:
 		${STAGEDIR}${PREFIX}/etc/$f.sample
 .endfor
 	${MKDIR} ${STAGEDIR}${DBDIR} ${STAGEDIR}${PREFIX}/etc/neo4j-certificates
+
 .include <bsd.port.mk>
diff --git a/databases/neo4j/distinfo b/databases/neo4j/distinfo
index d5333c0e627f..1bbf737adce9 100644
--- a/databases/neo4j/distinfo
+++ b/databases/neo4j/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650597389
-SHA256 (neo4j-community-4.2.16-unix.tar.gz) = 960df8e85ea1c4f0be3fab304c2a7f340bc688ebc3b4f5a3d348f72c18cc68e7
-SIZE (neo4j-community-4.2.16-unix.tar.gz) = 124615155
+TIMESTAMP = 1652856949
+SHA256 (neo4j-community-4.4.7-unix.tar.gz) = b2f5d1aa575b75613b8412860960449370c02f8696a390f621f54b323f3ef339
+SIZE (neo4j-community-4.4.7-unix.tar.gz) = 131360608
diff --git a/databases/neo4j/files/patch-bin_cypher-shell b/databases/neo4j/files/patch-bin_cypher-shell
index 51b392b13845..ad4d13823271 100644
--- a/databases/neo4j/files/patch-bin_cypher-shell
+++ b/databases/neo4j/files/patch-bin_cypher-shell
@@ -1,4 +1,4 @@
---- bin/cypher-shell.orig	2022-03-11 08:13:31 UTC
+--- bin/cypher-shell.orig	2022-05-11 06:09:41 UTC
 +++ bin/cypher-shell
 @@ -47,6 +47,8 @@ _find_java_cmd() {
  detect_os() {
diff --git a/databases/neo4j/files/patch-bin_neo4j b/databases/neo4j/files/patch-bin_neo4j
index 19758666a345..47fd4ff5bed1 100644
--- a/databases/neo4j/files/patch-bin_neo4j
+++ b/databases/neo4j/files/patch-bin_neo4j
@@ -1,33 +1,28 @@
---- bin/neo4j.orig	2022-03-11 02:55:54 UTC
+--- bin/neo4j.orig	2022-05-19 10:56:30 UTC
 +++ bin/neo4j
-@@ -56,6 +56,8 @@ build_classpath() {
- detect_os() {
-   if uname -s | grep -q Darwin; then
-     DIST_OS="macosx"
-+  elif uname -s | grep -q FreeBSD; then
-+    DIST_OS="freebsd"
-   else
-     DIST_OS="other"
-   fi
-@@ -171,6 +173,9 @@ _find_java_home() {
-   [[ "${JAVA_HOME:-}" ]] && return
+@@ -33,7 +33,7 @@ while [ -h "$PRG" ]; do
+ done
  
-   case "${DIST_OS}" in
-+    "freebsd")
-+      JAVA_HOME="%%JAVA_HOME%%"
-+      ;;
-     "macosx")
-       JAVA_HOME="$(/usr/libexec/java_home -v 11)"
-       ;;
-@@ -184,9 +189,9 @@ _show_java_help() {
+ PRGDIR=`dirname "$PRG"`
+-BASEDIR=`cd "$PRGDIR/.." >/dev/null; pwd`
++BASEDIR=%%PREFIX%%/neo4j
  
- _setup_calculated_paths() {
-   if [[ -z "${NEO4J_HOME:-}" ]]; then
--    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
-+    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
-   fi
--  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
-+  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
-   readonly NEO4J_HOME NEO4J_CONF
- }
+ # Reset the REPO variable. If you need to influence this use the environment setup file.
+ REPO=
+@@ -116,6 +116,9 @@ if $cygwin; then
+   [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"`
+   [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
+ fi
++
++NEO4J_CONF_ENV='NEO4J_CONF=%%NEO4J_CONFDIR%%'
++export NEO4J_CONF_ENV
  
+ exec "$JAVACMD" -Xmx128m \
+   -classpath "$CLASSPATH" \
+@@ -125,4 +128,4 @@ exec "$JAVACMD" -Xmx128m \
+   -Dapp.home="$BASEDIR" \
+   -Dbasedir="$BASEDIR" \
+   org.neo4j.server.startup.Neo4jCommand \
+-  "$@"
+\ No newline at end of file
++  "$@"
diff --git a/databases/neo4j/files/patch-bin_neo4j-admin b/databases/neo4j/files/patch-bin_neo4j-admin
index dd2e423bff85..38922b4c8923 100644
--- a/databases/neo4j/files/patch-bin_neo4j-admin
+++ b/databases/neo4j/files/patch-bin_neo4j-admin
@@ -1,33 +1,19 @@
---- bin/neo4j-admin.orig	2022-03-11 03:02:17 UTC
+--- bin/neo4j-admin.orig	2022-05-20 01:49:37 UTC
 +++ bin/neo4j-admin
-@@ -54,6 +54,8 @@ build_classpath() {
- detect_os() {
-   if uname -s | grep -q Darwin; then
-     DIST_OS="macosx"
-+  elif uname -s | grep -q FreeBSD; then
-+    DIST_OS="freebsd"
-   else
-     DIST_OS="other"
-   fi
-@@ -155,6 +157,9 @@ _find_java_home() {
-   [[ "${JAVA_HOME:-}" ]] && return
+@@ -33,7 +33,8 @@ while [ -h "$PRG" ]; do
+ done
  
-   case "${DIST_OS}" in
-+    "freebsd")
-+      JAVA_HOME="%%JAVA_HOME%%"
-+      ;;
-     "macosx")
-       JAVA_HOME="$(/usr/libexec/java_home -v 11)"
-       ;;
-@@ -168,9 +173,9 @@ _show_java_help() {
- 
- _setup_calculated_paths() {
-   if [[ -z "${NEO4J_HOME:-}" ]]; then
--    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
-+    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
-   fi
--  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
-+  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
-   readonly NEO4J_HOME NEO4J_CONF
- }
+ PRGDIR=`dirname "$PRG"`
+-BASEDIR=`cd "$PRGDIR/.." >/dev/null; pwd`
++#BASEDIR=`cd "$PRGDIR/.." >/dev/null; pwd`
++BASEDIR=%%PREFIX%%/neo4j
  
+ # Reset the REPO variable. If you need to influence this use the environment setup file.
+ REPO=
+@@ -125,4 +126,4 @@ exec "$JAVACMD" -Xmx128m \
+   -Dapp.home="$BASEDIR" \
+   -Dbasedir="$BASEDIR" \
+   org.neo4j.server.startup.Neo4jAdminCommand \
+-  "$@"
+\ No newline at end of file
++  "$@"
diff --git a/databases/neo4j/files/patch-conf_neo4j.conf b/databases/neo4j/files/patch-conf_neo4j.conf
index b98f78188243..d7a5984f2abc 100644
--- a/databases/neo4j/files/patch-conf_neo4j.conf
+++ b/databases/neo4j/files/patch-conf_neo4j.conf
@@ -1,20 +1,17 @@
---- conf/neo4j.conf.orig	2022-03-11 02:50:47 UTC
+--- conf/neo4j.conf.orig	2022-05-06 21:00:03 UTC
 +++ conf/neo4j.conf
-@@ -9,12 +9,12 @@
+@@ -9,11 +9,11 @@
  #dbms.default_database=neo4j
  
  # Paths of directories in the installation.
 -#dbms.directories.data=data
--#dbms.directories.plugins=plugins
++dbms.directories.data=/var/db/neo4j
+ #dbms.directories.plugins=plugins
 -#dbms.directories.logs=logs
-+dbms.directories.data=%%DBDIR%%
-+dbms.directories.plugins=%%PREFIX%%/lib/neo4j/plugins
-+dbms.directories.logs=%%LOGDIR%%
++dbms.directories.logs=/var/log/neo4j
  #dbms.directories.lib=lib
 -#dbms.directories.run=run
--#dbms.directories.transaction.logs.root=data/transactions
-+dbms.directories.run=%%RUNDIR%%
-+dbms.directories.transaction.logs.root=%%DBDIR%%/transactions
++dbms.directories.run=/var/run/
+ #dbms.directories.licenses=licenses
+ #dbms.directories.transaction.logs.root=data/transactions
  
- # This setting constrains all `LOAD CSV` import files to be under the `import` directory. Remove or comment it out to
- # allow files to be loaded from anywhere in the filesystem; this introduces possible security problems. See the
diff --git a/databases/neo4j/pkg-plist b/databases/neo4j/pkg-plist
index fda5b0150617..5a85a3dcee35 100644
--- a/databases/neo4j/pkg-plist
+++ b/databases/neo4j/pkg-plist
@@ -2,26 +2,28 @@ bin/cypher-shell
 bin/neo4j
 bin/neo4j-admin
 @sample etc/neo4j.conf.sample
+neo4j/lib/FastInfoset-1.2.16.jar
 neo4j/lib/WMI4Java-1.6.3.jar
 neo4j/lib/annotations-%%DISTVERSION%%.jar
-neo4j/lib/bcpkix-jdk15on-1.68.jar
-neo4j/lib/bcprov-jdk15on-1.68.jar
-neo4j/lib/caffeine-2.8.5.jar
+neo4j/lib/bcpkix-jdk15on-1.69.jar
+neo4j/lib/bcprov-jdk15on-1.69.jar
+neo4j/lib/bcutil-jdk15on-1.69.jar
+neo4j/lib/caffeine-3.0.3.jar
 neo4j/lib/commons-beanutils-1.9.4.jar
 neo4j/lib/commons-collections-3.2.2.jar
 neo4j/lib/commons-compress-1.21.jar
-neo4j/lib/commons-exec-1.3.jar
-neo4j/lib/commons-io-2.9.0.jar
-neo4j/lib/commons-lang3-3.11.jar
+neo4j/lib/commons-io-2.11.0.jar
+neo4j/lib/commons-lang3-3.12.0.jar
 neo4j/lib/commons-logging-1.2.jar
 neo4j/lib/commons-text-1.9.jar
 neo4j/lib/cypher-ast-factory-%%DISTVERSION%%.jar
-neo4j/lib/eclipse-collections-10.3.0.jar
-neo4j/lib/eclipse-collections-api-10.3.0.jar
+neo4j/lib/eclipse-collections-10.4.0.jar
+neo4j/lib/eclipse-collections-api-10.4.0.jar
 neo4j/lib/hk2-api-2.6.1.jar
 neo4j/lib/hk2-locator-2.6.1.jar
 neo4j/lib/hk2-utils-2.6.1.jar
-neo4j/lib/istack-commons-runtime-3.0.12.jar
+neo4j/lib/ipaddress-5.3.3.jar
+neo4j/lib/istack-commons-runtime-3.0.8.jar
 neo4j/lib/jPowerShell-3.0.jar
 neo4j/lib/jProcesses-1.6.5.jar
 neo4j/lib/jackson-annotations-2.13.2.jar
@@ -30,7 +32,6 @@ neo4j/lib/jackson-databind-2.13.2.2.jar
 neo4j/lib/jackson-jaxrs-base-2.13.2.jar
 neo4j/lib/jackson-jaxrs-json-provider-2.13.2.jar
 neo4j/lib/jackson-module-jaxb-annotations-2.13.2.jar
-neo4j/lib/jakarta.activation-1.2.2.jar
 neo4j/lib/jakarta.activation-api-1.2.1.jar
 neo4j/lib/jakarta.annotation-api-1.3.5.jar
 neo4j/lib/jakarta.inject-2.6.1.jar
@@ -41,8 +42,8 @@ neo4j/lib/javassist-3.25.0-GA.jar
 neo4j/lib/javax.servlet-api-3.1.0.jar
 neo4j/lib/javax.ws.rs-api-2.1.1.jar
 neo4j/lib/jaxb-api-2.3.0.jar
-neo4j/lib/jaxb-runtime-2.3.4.jar
-neo4j/lib/jctools-core-3.1.0.jar
+neo4j/lib/jaxb-runtime-2.3.2.jar
+neo4j/lib/jctools-core-3.3.0.jar
 neo4j/lib/jersey-client-2.34.jar
 neo4j/lib/jersey-common-2.34.jar
 neo4j/lib/jersey-container-servlet-2.34.jar
@@ -58,16 +59,20 @@ neo4j/lib/jetty-servlet-9.4.43.v20210629.jar
 neo4j/lib/jetty-util-9.4.43.v20210629.jar
 neo4j/lib/jetty-webapp-9.4.43.v20210629.jar
 neo4j/lib/jetty-xml-9.4.43.v20210629.jar
-neo4j/lib/jna-5.6.0.jar
-neo4j/lib/lucene-analyzers-common-8.5.1.jar
-neo4j/lib/lucene-backward-codecs-8.5.1.jar
-neo4j/lib/lucene-core-8.5.1.jar
-neo4j/lib/lucene-queryparser-8.5.1.jar
+neo4j/lib/jna-5.9.0.jar
+neo4j/lib/lucene-analyzers-common-8.9.0.jar
+neo4j/lib/lucene-backward-codecs-8.9.0.jar
+neo4j/lib/lucene-core-8.9.0.jar
+neo4j/lib/lucene-queryparser-8.9.0.jar
+neo4j/lib/magnolia_2.12-0.17.0.jar
+neo4j/lib/mercator_2.12-0.2.1.jar
 neo4j/lib/neo4j-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-ast-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-batch-insert-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-bolt-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-browser-4.4.3.jar
+neo4j/lib/neo4j-browser-4.4.5.jar
+neo4j/lib/neo4j-buffers-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-capabilities-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-codegen-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-collections-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-command-line-%%DISTVERSION%%.jar
@@ -78,6 +83,8 @@ neo4j/lib/neo4j-consistency-check-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-csv-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-ast-factory-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-cypher-config-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-storage-engine-util-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-expression-evaluator-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-interpreted-runtime-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-ir-%%DISTVERSION%%.jar
@@ -104,7 +111,6 @@ neo4j/lib/neo4j-index-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-io-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-kernel-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-kernel-api-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-label-index-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-layout-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-lock-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-logging-%%DISTVERSION%%.jar
@@ -129,25 +135,24 @@ neo4j/lib/neo4j-unsafe-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-util-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-values-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-wal-%%DISTVERSION%%.jar
-neo4j/lib/netty-buffer-4.1.73.Final.jar
-neo4j/lib/netty-codec-4.1.73.Final.jar
-neo4j/lib/netty-codec-http-4.1.73.Final.jar
-neo4j/lib/netty-common-4.1.73.Final.jar
-neo4j/lib/netty-handler-4.1.73.Final.jar
-neo4j/lib/netty-resolver-4.1.73.Final.jar
-neo4j/lib/netty-tcnative-classes-2.0.46.Final.jar
-neo4j/lib/netty-transport-4.1.73.Final.jar
-neo4j/lib/netty-transport-classes-epoll-4.1.73.Final.jar
-neo4j/lib/netty-transport-native-epoll-4.1.73.Final-linux-aarch_64.jar
-neo4j/lib/netty-transport-native-epoll-4.1.73.Final-linux-x86_64.jar
-neo4j/lib/netty-transport-native-unix-common-4.1.73.Final.jar
+neo4j/lib/netty-buffer-4.1.75.Final.jar
+neo4j/lib/netty-codec-4.1.75.Final.jar
+neo4j/lib/netty-codec-http-4.1.75.Final.jar
+neo4j/lib/netty-common-4.1.75.Final.jar
+neo4j/lib/netty-handler-4.1.75.Final.jar
+neo4j/lib/netty-resolver-4.1.75.Final.jar
+neo4j/lib/netty-transport-4.1.75.Final.jar
+neo4j/lib/netty-transport-classes-epoll-4.1.75.Final.jar
+neo4j/lib/netty-transport-native-epoll-4.1.75.Final-linux-aarch_64.jar
+neo4j/lib/netty-transport-native-epoll-4.1.75.Final-linux-x86_64.jar
+neo4j/lib/netty-transport-native-unix-common-4.1.75.Final.jar
 neo4j/lib/parboiled-core-1.2.0.jar
 neo4j/lib/parboiled-scala_2.12-1.2.0.jar
-neo4j/lib/picocli-4.5.0.jar
+neo4j/lib/picocli-4.6.1.jar
 neo4j/lib/reactive-streams-1.0.3.jar
-neo4j/lib/reactor-core-3.4.11.jar
-neo4j/lib/scala-library-2.12.10.jar
-neo4j/lib/scala-reflect-2.12.10.jar
+neo4j/lib/reactor-core-3.4.15.jar
+neo4j/lib/scala-library-2.12.13.jar
+neo4j/lib/scala-reflect-2.12.13.jar
 neo4j/lib/server-api-%%DISTVERSION%%.jar
 neo4j/lib/shiro-cache-1.8.0.jar
 neo4j/lib/shiro-config-core-1.8.0.jar
@@ -160,8 +165,9 @@ neo4j/lib/shiro-event-1.8.0.jar
 neo4j/lib/shiro-lang-1.8.0.jar
 neo4j/lib/slf4j-api-1.7.30.jar
 neo4j/lib/slf4j-nop-1.7.30.jar
-neo4j/lib/txw2-2.3.4.jar
-neo4j/lib/zstd-jni-1.4.5-6.jar
+neo4j/lib/stax-ex-1.8.1.jar
+neo4j/lib/txw2-2.3.2.jar
+neo4j/lib/zstd-jni-1.5.0-4.jar
 neo4j/lib/zstd-proxy-%%DISTVERSION%%.jar
 neo4j/libexec/tools/cypher-shell.jar
 @dir etc/neo4j-certificates