From owner-svn-ports-all@freebsd.org Thu Dec 8 17:46:30 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3FAEBC6EB5B; Thu, 8 Dec 2016 17:46:30 +0000 (UTC) (envelope-from girgen@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 mx1.freebsd.org (Postfix) with ESMTPS id 196DE1246; Thu, 8 Dec 2016 17:46:30 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB8HkTiV079112; Thu, 8 Dec 2016 17:46:29 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB8HkS7L079105; Thu, 8 Dec 2016 17:46:28 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201612081746.uB8HkS7L079105@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Thu, 8 Dec 2016 17:46:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428146 - in head/sysutils: filebeat filebeat/files packetbeat packetbeat/files X-SVN-Group: ports-head 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.23 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: Thu, 08 Dec 2016 17:46:30 -0000 Author: girgen Date: Thu Dec 8 17:46:28 2016 New Revision: 428146 URL: https://svnweb.freebsd.org/changeset/ports/428146 Log: Update to 5.0.2 Modified: head/sysutils/filebeat/Makefile head/sysutils/filebeat/distinfo head/sysutils/filebeat/files/filebeat.in head/sysutils/filebeat/files/patch-libbeat_scripts_Makefile head/sysutils/packetbeat/Makefile head/sysutils/packetbeat/distinfo head/sysutils/packetbeat/files/patch-libbeat_scripts_Makefile Modified: head/sysutils/filebeat/Makefile ============================================================================== --- head/sysutils/filebeat/Makefile Thu Dec 8 17:41:39 2016 (r428145) +++ head/sysutils/filebeat/Makefile Thu Dec 8 17:46:28 2016 (r428146) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= filebeat -PORTVERSION= 1.2.3 +PORTVERSION= 5.0.2 DISTVERSIONPREFIX=v CATEGORIES= sysutils @@ -27,7 +27,7 @@ do-build: do-install: ${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_TARGETS}/${GO_TARGETS} \ ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${GO_WRKSRC}/${GO_TARGETS}/etc/${GO_TARGETS}.yml \ + ${INSTALL_DATA} ${WRKSRC}/${GO_TARGETS}/${GO_TARGETS}.yml \ ${STAGEDIR}${PREFIX}/etc/${GO_TARGETS}.yml.sample .include Modified: head/sysutils/filebeat/distinfo ============================================================================== --- head/sysutils/filebeat/distinfo Thu Dec 8 17:41:39 2016 (r428145) +++ head/sysutils/filebeat/distinfo Thu Dec 8 17:46:28 2016 (r428146) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464325885 -SHA256 (elastic-beats-v1.2.3_GH0.tar.gz) = 8eea85de415898c362144ba533062651d8891241c738799e54cc9b17040c1fc9 -SIZE (elastic-beats-v1.2.3_GH0.tar.gz) = 9922853 +TIMESTAMP = 1481067807 +SHA256 (elastic-beats-v5.0.2_GH0.tar.gz) = feef1e53b978c12b3b3c552534fd666839df5d7d3b974e16636360ca6c4ab7c0 +SIZE (elastic-beats-v5.0.2_GH0.tar.gz) = 15774694 Modified: head/sysutils/filebeat/files/filebeat.in ============================================================================== --- head/sysutils/filebeat/files/filebeat.in Thu Dec 8 17:41:39 2016 (r428145) +++ head/sysutils/filebeat/files/filebeat.in Thu Dec 8 17:46:28 2016 (r428146) @@ -6,7 +6,8 @@ # BEFORE: LOGIN # KEYWORD: shutdown -# Add the following lines to /etc/rc.conf to enable logstash-forwarder: +# Add the following lines to /etc/rc.conf to enable filebeat: +# # filebeat_enable (bool): Set to YES to enable filebeat # Default: NO # filebeat_flags (str): Extra flags passed to filebeat Modified: head/sysutils/filebeat/files/patch-libbeat_scripts_Makefile ============================================================================== --- head/sysutils/filebeat/files/patch-libbeat_scripts_Makefile Thu Dec 8 17:41:39 2016 (r428145) +++ head/sysutils/filebeat/files/patch-libbeat_scripts_Makefile Thu Dec 8 17:46:28 2016 (r428146) @@ -1,11 +1,11 @@ ---- libbeat/scripts/Makefile.orig 2016-02-11 14:04:40 UTC -+++ libbeat/scripts/Makefile -@@ -6,7 +6,7 @@ ARCH?=$(shell uname -m) - export PATH := ./bin:$(PATH) - export GO15VENDOREXPERIMENT=1 +--- libbeat/scripts/Makefile.orig 2016-12-08 18:08:06.201040000 +0100 ++++ libbeat/scripts/Makefile 2016-12-08 18:08:14.835100000 +0100 +@@ -30,7 +30,7 @@ GOFILES = $(shell find . -type f -name '*.go') --SHELL=/bin/bash -+SHELL=/bin/sh - ES_HOST?="elasticsearch-210" - BEAT_DIR?=github.com/elastic/beats - BUILD_DIR=build + GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*") + GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go') +-SHELL=bash ++SHELL=sh + ES_HOST?="elasticsearch" + PWD=$(shell pwd) + BUILD_DIR?=$(shell pwd)/build Modified: head/sysutils/packetbeat/Makefile ============================================================================== --- head/sysutils/packetbeat/Makefile Thu Dec 8 17:41:39 2016 (r428145) +++ head/sysutils/packetbeat/Makefile Thu Dec 8 17:46:28 2016 (r428146) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= packetbeat -PORTVERSION= 1.2.3 +PORTVERSION= 5.0.2 DISTVERSIONPREFIX=v CATEGORIES= sysutils @@ -11,8 +11,6 @@ COMMENT= Elasticsearch real-time network LICENSE= APACHE20 -#BUILD_DEPENDS= go:lang/go - USE_GITHUB= yes GH_ACCOUNT= elastic GH_PROJECT= beats @@ -29,7 +27,7 @@ do-build: do-install: ${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_TARGETS}/${GO_TARGETS} \ ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${GO_WRKSRC}/${GO_TARGETS}/etc/${GO_TARGETS}.yml \ + ${INSTALL_DATA} ${WRKSRC}/${GO_TARGETS}/${GO_TARGETS}.yml \ ${STAGEDIR}${PREFIX}/etc/${GO_TARGETS}.yml.sample .include Modified: head/sysutils/packetbeat/distinfo ============================================================================== --- head/sysutils/packetbeat/distinfo Thu Dec 8 17:41:39 2016 (r428145) +++ head/sysutils/packetbeat/distinfo Thu Dec 8 17:46:28 2016 (r428146) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464325900 -SHA256 (elastic-beats-v1.2.3_GH0.tar.gz) = 8eea85de415898c362144ba533062651d8891241c738799e54cc9b17040c1fc9 -SIZE (elastic-beats-v1.2.3_GH0.tar.gz) = 9922853 +TIMESTAMP = 1481067807 +SHA256 (elastic-beats-v5.0.2_GH0.tar.gz) = feef1e53b978c12b3b3c552534fd666839df5d7d3b974e16636360ca6c4ab7c0 +SIZE (elastic-beats-v5.0.2_GH0.tar.gz) = 15774694 Modified: head/sysutils/packetbeat/files/patch-libbeat_scripts_Makefile ============================================================================== --- head/sysutils/packetbeat/files/patch-libbeat_scripts_Makefile Thu Dec 8 17:41:39 2016 (r428145) +++ head/sysutils/packetbeat/files/patch-libbeat_scripts_Makefile Thu Dec 8 17:46:28 2016 (r428146) @@ -1,11 +1,11 @@ ---- libbeat/scripts/Makefile.orig 2016-02-11 14:04:40 UTC -+++ libbeat/scripts/Makefile -@@ -6,7 +6,7 @@ ARCH?=$(shell uname -m) - export PATH := ./bin:$(PATH) - export GO15VENDOREXPERIMENT=1 +--- libbeat/scripts/Makefile.orig 2016-12-08 18:08:06.201040000 +0100 ++++ libbeat/scripts/Makefile 2016-12-08 18:08:14.835100000 +0100 +@@ -30,7 +30,7 @@ GOFILES = $(shell find . -type f -name '*.go') --SHELL=/bin/bash -+SHELL=/bin/sh - ES_HOST?="elasticsearch-210" - BEAT_DIR?=github.com/elastic/beats - BUILD_DIR=build + GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*") + GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go') +-SHELL=bash ++SHELL=sh + ES_HOST?="elasticsearch" + PWD=$(shell pwd) + BUILD_DIR?=$(shell pwd)/build