From owner-svn-ports-all@freebsd.org Mon Mar 29 08:44:07 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6C0E25C12A5; Mon, 29 Mar 2021 08:44:07 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F85j32dqbz4p5b; Mon, 29 Mar 2021 08:44:07 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D8157F7D; Mon, 29 Mar 2021 08:44:07 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12T8i7BE028418; Mon, 29 Mar 2021 08:44:07 GMT (envelope-from dch@FreeBSD.org) Received: (from dch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12T8i6LD028415; Mon, 29 Mar 2021 08:44:06 GMT (envelope-from dch@FreeBSD.org) Message-Id: <202103290844.12T8i6LD028415@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dch set sender to dch@FreeBSD.org using -f From: Dave Cottlehuber Date: Mon, 29 Mar 2021 08:44:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569438 - in head/sysutils/graylog: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dch X-SVN-Commit-Paths: in head/sysutils/graylog: . files X-SVN-Commit-Revision: 569438 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2021 08:44:07 -0000 Author: dch Date: Mon Mar 29 08:44:06 2021 New Revision: 569438 URL: https://svnweb.freebsd.org/changeset/ports/569438 Log: sysutils/graylog: amend .sample to comply with tighter build rules - while here, remove forced IPv4 requirements, graylog is no longer so opinionated about this Reported by: pkg-fallout Sponsored by: SkunkWerks, GmbH Modified: head/sysutils/graylog/Makefile head/sysutils/graylog/files/graylog.in head/sysutils/graylog/files/pkg-message.in head/sysutils/graylog/pkg-plist Modified: head/sysutils/graylog/Makefile ============================================================================== --- head/sysutils/graylog/Makefile Mon Mar 29 08:20:51 2021 (r569437) +++ head/sysutils/graylog/Makefile Mon Mar 29 08:44:06 2021 (r569438) @@ -3,6 +3,7 @@ PORTNAME= graylog DISTVERSION= 4.0.5 +PORTREVISION= 2 CATEGORIES= sysutils java MASTER_SITES= https://downloads.graylog.org/releases/ DISTFILES= graylog/${DISTNAME}${EXTRACT_SUFX} \ @@ -55,11 +56,13 @@ do-install: @${MKDIR} ${STAGEDIR}${GRAYLOG_DATA_DIR} @${MKDIR} ${STAGEDIR}${GRAYLOG_LOGS_DIR} ${INSTALL_DATA} ${WRKSRC}/graylog.jar ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/graylog.conf.example ${STAGEDIR}${ETCDIR}/graylog.conf.example + ${INSTALL_DATA} ${WRKSRC}/graylog.conf.example \ + ${STAGEDIR}${ETCDIR}/graylog.conf.sample + ${INSTALL_DATA} ${WRKDIR}/log4j2.xml \ + ${STAGEDIR}${ETCDIR}/log4j2.xml.sample cd ${WRKDIR}/graylog-integrations-plugins-${DISTVERSION}/plugin && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin/ cd ${WRKSRC}/plugin && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin/ - ${INSTALL_DATA} ${WRKDIR}/log4j2.xml ${STAGEDIR}${ETCDIR}/log4j2.xml.example .include Modified: head/sysutils/graylog/files/graylog.in ============================================================================== --- head/sysutils/graylog/files/graylog.in Mon Mar 29 08:20:51 2021 (r569437) +++ head/sysutils/graylog/files/graylog.in Mon Mar 29 08:44:06 2021 (r569438) @@ -66,7 +66,6 @@ load_rc_config $name java_options=" \ -Djava.awt.headless=true \ - -Djava.net.preferIPv4Stack=true \ -Dapp=${name} \ -Dlog4j.configurationFile=${graylog_log_config} \ -Xms${graylog_min_mem} \ Modified: head/sysutils/graylog/files/pkg-message.in ============================================================================== --- head/sysutils/graylog/files/pkg-message.in Mon Mar 29 08:20:51 2021 (r569437) +++ head/sysutils/graylog/files/pkg-message.in Mon Mar 29 08:44:06 2021 (r569438) @@ -33,6 +33,12 @@ 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 + +If you are running on a dual-stack (ipv4+ipv6) system, you may need to +include the additional JVM tuning parameter: + + -Djava.net.preferIPv4Stack=true + EOM } ] Modified: head/sysutils/graylog/pkg-plist ============================================================================== --- head/sysutils/graylog/pkg-plist Mon Mar 29 08:20:51 2021 (r569437) +++ head/sysutils/graylog/pkg-plist Mon Mar 29 08:44:06 2021 (r569438) @@ -8,5 +8,5 @@ @dir %%ETCDIR%% @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_DATA_DIR%% @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_LOGS_DIR%% -@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/graylog.conf.example -@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/log4j2.xml.example +@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/graylog.conf.sample +@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/log4j2.xml.sample