svn commit: r560510 - in head: . sysutils/graylog sysutils/graylog/files

[Dave Cottlehuber]

Author: dch
Date: Wed Jan  6 13:32:23 2021
New Revision: 560510
URL: https://svnweb.freebsd.org/changeset/ports/560510

Log:
  sysutils/graylog: update to 4.0 and change license to SSPL
  
  graylog 4.0 and higher now use a new license, the SSPL. For more
  details, see https://www.graylog.org/post/graylog-v4-0-licensing-sspl
  
  Submitted by:	Charles Gonçalves <charles at freebsdbrasil.com.br>
  Reviewed by:	dch (maintainer)
  Sponsored by:	SkunkWerks, GmbH
  Differential Revision:	https://reviews.freebsd.org/D27253

Modified:
  head/UPDATING
  head/sysutils/graylog/Makefile
  head/sysutils/graylog/distinfo
  head/sysutils/graylog/files/pkg-message.in
  head/sysutils/graylog/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Jan  6 13:24:01 2021	(r560509)
+++ head/UPDATING	Wed Jan  6 13:32:23 2021	(r560510)
@@ -5,6 +5,13 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20210106:
+  AFFECTS: sysutils/graylog
+  AUTHOR: dch at FreeBSD.org
+
+  graylog 4.0 and higher now use a new license, the SSPL. For more
+  details, see https://www.graylog.org/post/graylog-v4-0-licensing-sspl
+
 20210102:
   AFFECTS: x11/libexo, XFCE4 desktop users
   AUTHOR: madpilot at FreeBSD.org

Modified: head/sysutils/graylog/Makefile
==============================================================================
--- head/sysutils/graylog/Makefile	Wed Jan  6 13:24:01 2021	(r560509)
+++ head/sysutils/graylog/Makefile	Wed Jan  6 13:32:23 2021	(r560510)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	graylog
-DISTVERSION=	3.3.8
+DISTVERSION=	4.0.1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.graylog.org/releases/
 DISTFILES=	graylog/${DISTNAME}${EXTRACT_SUFX} \
@@ -11,8 +11,11 @@ DISTFILES=	graylog/${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	dch at FreeBSD.org
 COMMENT=	Tool for centralized log collection
 
-LICENSE=	GPLv3+
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	SSPLv1 APACHE20
+LICENSE_COMB=	multi
+LICENSE_NAME_SSPLv1=	Server Side Public License
+LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE
+LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		tar:tgz
 USE_JAVA=	yes

Modified: head/sysutils/graylog/distinfo
==============================================================================
--- head/sysutils/graylog/distinfo	Wed Jan  6 13:24:01 2021	(r560509)
+++ head/sysutils/graylog/distinfo	Wed Jan  6 13:32:23 2021	(r560510)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1602942955
-SHA256 (graylog/graylog-3.3.8.tgz) = 37c795ffc516115c7d1d1e0fb805f49473a0f6dce86c7a41b90272dd9e3eac78
-SIZE (graylog/graylog-3.3.8.tgz) = 129314297
-SHA256 (graylog-integrations/graylog-integrations-plugins-3.3.8.tgz) = 22536cf906e46be7014ab2eec24b215ab98bcf38e7b406a662f1db48441e5d01
-SIZE (graylog-integrations/graylog-integrations-plugins-3.3.8.tgz) = 28600261
+TIMESTAMP = 1609937385
+SHA256 (graylog/graylog-4.0.1.tgz) = 4b1c7b5a67a0b3cd84838d9cf977efe2ec653d0b8d458800df6d20deb336e5f9
+SIZE (graylog/graylog-4.0.1.tgz) = 163263748
+SHA256 (graylog-integrations/graylog-integrations-plugins-4.0.1.tgz) = 2d1031fe5310e92908f8764281d8e99dc66d10e73c2f008185795c18fec3436f
+SIZE (graylog-integrations/graylog-integrations-plugins-4.0.1.tgz) = 29070372

Modified: head/sysutils/graylog/files/pkg-message.in
==============================================================================
--- head/sysutils/graylog/files/pkg-message.in	Wed Jan  6 13:24:01 2021	(r560509)
+++ head/sysutils/graylog/files/pkg-message.in	Wed Jan  6 13:32:23 2021	(r560510)
@@ -12,12 +12,27 @@ When running graylog in a jail, you need to set enforc
 For a single-node installation, install:
 
 - databases/mongodb40 or higher
-- textproc/elasticsearch5 or higher
+- textproc/elasticsearch6 or higher
 
 And ensure that the elasticsearch cluster name matches that used by graylog.
 
-The locations for configuration files have changed to match upstream
-versions in 3.0 of this port, refer to UPDATING for migration steps.
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+graylog now has a *minimum* dependency of elasticsearch6 or higher. You
+may need to re-index after upgrading to ES6, please refer to graylog
+docs for more details.
+
+- textproc/elasticsearch6 or higher
+- databases/mongodb40 or higher
+
+Remember to backup both MongoDB & ES6 databases before upgrading Graylog
+itself.
+
+Beginning with v4.0, Graylog Open Source is licensed under the
+Server Side Public License (SSPL). For more details, see
+https://www.graylog.org/post/graylog-v4-0-licensing-sspl
 EOM
 }
 ]

Modified: head/sysutils/graylog/pkg-plist
==============================================================================
--- head/sysutils/graylog/pkg-plist	Wed Jan  6 13:24:01 2021	(r560509)
+++ head/sysutils/graylog/pkg-plist	Wed Jan  6 13:32:23 2021	(r560510)
@@ -3,6 +3,8 @@
 %%DATADIR%%/plugin/%%PORTNAME%%-plugin-collector-%%DISTVERSION%%.jar
 %%DATADIR%%/plugin/%%PORTNAME%%-plugin-integrations-%%DISTVERSION%%.jar
 %%DATADIR%%/plugin/%%PORTNAME%%-plugin-threatintel-%%DISTVERSION%%.jar
+%%DATADIR%%/plugin/%%PORTNAME%%-storage-elasticsearch6-%%DISTVERSION%%.jar
+%%DATADIR%%/plugin/%%PORTNAME%%-storage-elasticsearch7-%%DISTVERSION%%.jar
 @dir %%ETCDIR%%
 @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_DATA_DIR%%
 @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_LOGS_DIR%%