From owner-svn-ports-branches@freebsd.org Sun Apr 24 11:59:40 2016 Return-Path: Delivered-To: svn-ports-branches@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 49A49B1BB72; Sun, 24 Apr 2016 11:59:40 +0000 (UTC) (envelope-from lme@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 0E2991658; Sun, 24 Apr 2016 11:59:39 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OBxdPm090948; Sun, 24 Apr 2016 11:59:39 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OBxbqx090932; Sun, 24 Apr 2016 11:59:37 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604241159.u3OBxbqx090932@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sun, 24 Apr 2016 11:59:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413936 - in branches/2016Q2/net-mgmt: zabbix2-server zabbix2-server/files zabbix22-server zabbix22-server/files zabbix24-server zabbix24-server/files zabbix3-server zabbix3-server/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 11:59:40 -0000 Author: lme Date: Sun Apr 24 11:59:37 2016 New Revision: 413936 URL: https://svnweb.freebsd.org/changeset/ports/413936 Log: MFH: r413935 - Fixes in {agent,proxy,server} rc start scripts: - SysV IPC leak - Restart race - Allow to specify a custom PATH in rc.conf - Bump PORTREVISION PR: 207896 Submitted by: kbowling Approved by: maintainer Sponsored by: Essen Linuxhotel Hackathon 2016 Approved by: portmgr (bapt) Modified: branches/2016Q2/net-mgmt/zabbix2-server/Makefile branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_agentd.in branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_proxy.in branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_server.in branches/2016Q2/net-mgmt/zabbix22-server/Makefile branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_agentd.in branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_proxy.in branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_server.in branches/2016Q2/net-mgmt/zabbix24-server/Makefile branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_agentd.in branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_proxy.in branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_server.in branches/2016Q2/net-mgmt/zabbix3-server/Makefile branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_agentd.in branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_proxy.in branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_server.in Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net-mgmt/zabbix2-server/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/zabbix2-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix2-server/Makefile Sun Apr 24 11:59:37 2016 (r413936) @@ -3,7 +3,7 @@ PORTNAME= zabbix2 PORTVERSION= 2.0.16 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_agentd.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_agentd.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_agentd" rcvar=zabbix_agentd_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_proxy.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_proxy.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,34 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_server.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_server.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix22-server/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/zabbix22-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix22-server/Makefile Sun Apr 24 11:59:37 2016 (r413936) @@ -3,6 +3,7 @@ PORTNAME= zabbix22 PORTVERSION= 2.2.11 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_agentd.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_agentd.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_agentd" rcvar=zabbix_agentd_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_proxy.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_proxy.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_server.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_server.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix24-server/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/zabbix24-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix24-server/Makefile Sun Apr 24 11:59:37 2016 (r413936) @@ -3,7 +3,7 @@ PORTNAME= zabbix24 PORTVERSION= 2.4.7 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_agentd.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_agentd.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_agentd" rcvar=zabbix_agentd_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_proxy.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_proxy.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_server.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_server.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix3-server/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/zabbix3-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix3-server/Makefile Sun Apr 24 11:59:37 2016 (r413936) @@ -3,7 +3,7 @@ PORTNAME= zabbix3 PORTVERSION= 3.0.1 -PORTREVISION?= 0 +PORTREVISION?= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_agentd.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_agentd.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -22,5 +26,30 @@ required_files="%%ETCDIR%%/${name}.conf" load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_proxy.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_proxy.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,34 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_server.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_server.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" From owner-svn-ports-branches@freebsd.org Sun Apr 24 13:57:23 2016 Return-Path: Delivered-To: svn-ports-branches@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 25E14B1A01F; Sun, 24 Apr 2016 13:57:23 +0000 (UTC) (envelope-from riggs@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 D985B172A; Sun, 24 Apr 2016 13:57:22 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3ODvMXv028184; Sun, 24 Apr 2016 13:57:22 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3ODvMih028183; Sun, 24 Apr 2016 13:57:22 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201604241357.u3ODvMih028183@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 24 Apr 2016 13:57:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413943 - branches/2016Q2/audio/taglookup/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 13:57:23 -0000 Author: riggs Date: Sun Apr 24 13:57:21 2016 New Revision: 413943 URL: https://svnweb.freebsd.org/changeset/ports/413943 Log: MFH: r413942 Fix build with libc++ 3.8.0 PR: 208490 Submitted by: dim Approved by: ports-secteam (build fix blanket), maintainer timeout Modified: branches/2016Q2/audio/taglookup/files/patch-tag.cpp Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/audio/taglookup/files/patch-tag.cpp ============================================================================== --- branches/2016Q2/audio/taglookup/files/patch-tag.cpp Sun Apr 24 13:54:48 2016 (r413942) +++ branches/2016Q2/audio/taglookup/files/patch-tag.cpp Sun Apr 24 13:57:21 2016 (r413943) @@ -20,3 +20,14 @@ return new_string; } // toUTF8String +@@ -166,8 +167,8 @@ namespace TagLookup + + bool operator() (const FileRefLengthPair &f1, const FileRefLengthPair &f2) + { +- if( abs(f1.second - x_) < +- abs(f2.second - x_) ) ++ if( abs((int)(f1.second - x_)) < ++ abs((int)(f2.second - x_)) ) + return true; + else + return false; From owner-svn-ports-branches@freebsd.org Sun Apr 24 19:35:25 2016 Return-Path: Delivered-To: svn-ports-branches@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 01700B1BD09; Sun, 24 Apr 2016 19:35:25 +0000 (UTC) (envelope-from pi@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 D1B731A27; Sun, 24 Apr 2016 19:35:24 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OJZOYV033333; Sun, 24 Apr 2016 19:35:24 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OJZN71033331; Sun, 24 Apr 2016 19:35:23 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201604241935.u3OJZN71033331@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 24 Apr 2016 19:35:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413956 - branches/2016Q2/textproc/apache-poi X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 19:35:25 -0000 Author: pi Date: Sun Apr 24 19:35:23 2016 New Revision: 413956 URL: https://svnweb.freebsd.org/changeset/ports/413956 Log: textproc/apache-poi: 3.10.1 -> 3.14 Changes: http://poi.apache.org/changes.html - Fix for CVE-2014-3574 - Common: New version of ooxml-schema and ooxml-security jars which are linked to custom safe type loader - Common: OPC relation fix for multiple same named ids (#54916) - Common: Update third-party dependencies: commons-logging, commons-codec, xmlsec, bouncycastle - Excel: Allow to set multiple cell style properties at once (#58633) - Excel: Add API for inserting ignored warnings into XSSF sheets. This can be used e.g. to suppress 'number stored as text' warnings. (#56892) - Powerpoint: unify hyperlink handling - HSLF: various fixes for parsing and rendering - WMF: new API for WMF parsing and rendering (for Powerpoint) - XWPF: various fixes for handling paragraphs and tables PR: 207934 MFH: r413539 Submitted by: pfg Approved by: ports-secteam (feld) Security: CVE-2014-3574 Modified: branches/2016Q2/textproc/apache-poi/Makefile branches/2016Q2/textproc/apache-poi/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/textproc/apache-poi/Makefile ============================================================================== --- branches/2016Q2/textproc/apache-poi/Makefile Sun Apr 24 19:20:10 2016 (r413955) +++ branches/2016Q2/textproc/apache-poi/Makefile Sun Apr 24 19:35:23 2016 (r413956) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= poi -PORTVERSION= 3.10.1 +PORTVERSION= 3.14 CATEGORIES= textproc devel java MASTER_SITES= APACHE/${PORTNAME}/release/bin PKGNAMEPREFIX= apache- -DISTNAME= ${PORTNAME}-bin-${PORTVERSION}-${RELEASE_DATE} +DISTNAME= ${PORTNAME}-bin-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Java API To Access Microsoft Format Files @@ -18,7 +18,7 @@ PORTDOCS= * USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes -RELEASE_DATE= 20140818 +RELEASE_DATE= 20160307 JARNAMES= examples excelant scratchpad ooxml ooxml-schemas WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar @@ -33,9 +33,9 @@ PLIST_FILES+= %%JAVAJARDIR%%/${PORTNAME} do-install: @${ECHO_MSG} -n ">> Installing JAR as ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${RELEASE_DATE}.jar..." - @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}-${RELEASE_DATE}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}-${RELEASE_DATE}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar .for i in ${JARNAMES} - @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${i}-${PORTVERSION}-${RELEASE_DATE}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${i}.jar + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${i}-${PORTVERSION}-${RELEASE_DATE}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${i}.jar .endfor @${ECHO_MSG} " [ DONE ]" @${ECHO_MSG} -n ">> Installing documentation in ${STAGEDIR}${DOCSDIR}/..." Modified: branches/2016Q2/textproc/apache-poi/distinfo ============================================================================== --- branches/2016Q2/textproc/apache-poi/distinfo Sun Apr 24 19:20:10 2016 (r413955) +++ branches/2016Q2/textproc/apache-poi/distinfo Sun Apr 24 19:35:23 2016 (r413956) @@ -1,2 +1,2 @@ -SHA256 (poi-bin-3.10.1-20140818.tar.gz) = 9b6b7fcb5e90fe128808e5ecee97ab911676fbd419df85f660417e216ca8045c -SIZE (poi-bin-3.10.1-20140818.tar.gz) = 16653077 +SHA256 (poi-bin-3.14.tar.gz) = 4aeef6a01d966510fb9d8e07faa04d8dfa6a87234beb4cd07619f914dd1b02ec +SIZE (poi-bin-3.14.tar.gz) = 19438466 From owner-svn-ports-branches@freebsd.org Mon Apr 25 16:26:47 2016 Return-Path: Delivered-To: svn-ports-branches@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 AA2FDB1C82C; Mon, 25 Apr 2016 16:26:47 +0000 (UTC) (envelope-from jbeich@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 85A4A1863; Mon, 25 Apr 2016 16:26:47 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3PGQkr8018687; Mon, 25 Apr 2016 16:26:46 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3PGQkH7018682; Mon, 25 Apr 2016 16:26:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201604251626.u3PGQkH7018682@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 25 Apr 2016 16:26:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414021 - in branches/2016Q2: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/libxul/files www/seamonkey/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2016 16:26:47 -0000 Author: jbeich Date: Mon Apr 25 16:26:46 2016 New Revision: 414021 URL: https://svnweb.freebsd.org/changeset/ports/414021 Log: MFH: r414020 gecko: unbreak build with LIBPROXY=on PR: 208855 Reported by: Ting-Wei Lan, Walter Schwarzenfeld Submitted by: cmt via r401981 Approved by: ports-secteam "build fix" blanket Added: branches/2016Q2/mail/thunderbird/files/patch-bug1243312 - copied unchanged from r414020, head/mail/thunderbird/files/patch-bug1243312 branches/2016Q2/www/firefox-esr/files/patch-bug1243312 - copied unchanged from r414020, head/www/firefox-esr/files/patch-bug1243312 branches/2016Q2/www/firefox/files/patch-bug1243312 - copied unchanged from r414020, head/www/firefox/files/patch-bug1243312 branches/2016Q2/www/libxul/files/patch-bug1243312 - copied unchanged from r414020, head/www/libxul/files/patch-bug1243312 branches/2016Q2/www/seamonkey/files/patch-bug1243312 - copied unchanged from r414020, head/www/seamonkey/files/patch-bug1243312 Deleted: branches/2016Q2/www/firefox/files/patch-toolkit_system_unixproxy_nsLibProxySettings.cpp branches/2016Q2/www/seamonkey/files/patch-toolkit_system_unixproxy_nsLibProxySettings.cpp Modified: Directory Properties: branches/2016Q2/ (props changed) Copied: branches/2016Q2/mail/thunderbird/files/patch-bug1243312 (from r414020, head/mail/thunderbird/files/patch-bug1243312) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/mail/thunderbird/files/patch-bug1243312 Mon Apr 25 16:26:46 2016 (r414021, copy of r414020, head/mail/thunderbird/files/patch-bug1243312) @@ -0,0 +1,21 @@ +commit a5c6f19 +Author: Dragana Damjanovic +Date: Wed Jan 27 01:47:00 2016 +0100 + + Bug 1243312 - nsNetCID is missing in toolkit/system/unixproxy/nsLibProxySettings.cpp. r=jduell +--- + toolkit/system/unixproxy/nsLibProxySettings.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git toolkit/system/unixproxy/nsLibProxySettings.cpp toolkit/system/unixproxy/nsLibProxySettings.cpp +index f6ec377..e9179c1 100644 +--- mozilla/toolkit/system/unixproxy/nsLibProxySettings.cpp ++++ mozilla/toolkit/system/unixproxy/nsLibProxySettings.cpp +@@ -9,6 +9,7 @@ + #include "nsIURI.h" + #include "nsString.h" + #include "nsCOMPtr.h" ++#include "nsNetCID.h" + #include "nspr.h" + + extern "C" { Copied: branches/2016Q2/www/firefox-esr/files/patch-bug1243312 (from r414020, head/www/firefox-esr/files/patch-bug1243312) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/www/firefox-esr/files/patch-bug1243312 Mon Apr 25 16:26:46 2016 (r414021, copy of r414020, head/www/firefox-esr/files/patch-bug1243312) @@ -0,0 +1,21 @@ +commit a5c6f19 +Author: Dragana Damjanovic +Date: Wed Jan 27 01:47:00 2016 +0100 + + Bug 1243312 - nsNetCID is missing in toolkit/system/unixproxy/nsLibProxySettings.cpp. r=jduell +--- + toolkit/system/unixproxy/nsLibProxySettings.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git toolkit/system/unixproxy/nsLibProxySettings.cpp toolkit/system/unixproxy/nsLibProxySettings.cpp +index f6ec377..e9179c1 100644 +--- toolkit/system/unixproxy/nsLibProxySettings.cpp ++++ toolkit/system/unixproxy/nsLibProxySettings.cpp +@@ -9,6 +9,7 @@ + #include "nsIURI.h" + #include "nsString.h" + #include "nsCOMPtr.h" ++#include "nsNetCID.h" + #include "nspr.h" + + extern "C" { Copied: branches/2016Q2/www/firefox/files/patch-bug1243312 (from r414020, head/www/firefox/files/patch-bug1243312) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/www/firefox/files/patch-bug1243312 Mon Apr 25 16:26:46 2016 (r414021, copy of r414020, head/www/firefox/files/patch-bug1243312) @@ -0,0 +1,21 @@ +commit a5c6f19 +Author: Dragana Damjanovic +Date: Wed Jan 27 01:47:00 2016 +0100 + + Bug 1243312 - nsNetCID is missing in toolkit/system/unixproxy/nsLibProxySettings.cpp. r=jduell +--- + toolkit/system/unixproxy/nsLibProxySettings.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git toolkit/system/unixproxy/nsLibProxySettings.cpp toolkit/system/unixproxy/nsLibProxySettings.cpp +index f6ec377..e9179c1 100644 +--- toolkit/system/unixproxy/nsLibProxySettings.cpp ++++ toolkit/system/unixproxy/nsLibProxySettings.cpp +@@ -9,6 +9,7 @@ + #include "nsIURI.h" + #include "nsString.h" + #include "nsCOMPtr.h" ++#include "nsNetCID.h" + #include "nspr.h" + + extern "C" { Copied: branches/2016Q2/www/libxul/files/patch-bug1243312 (from r414020, head/www/libxul/files/patch-bug1243312) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/www/libxul/files/patch-bug1243312 Mon Apr 25 16:26:46 2016 (r414021, copy of r414020, head/www/libxul/files/patch-bug1243312) @@ -0,0 +1,21 @@ +commit a5c6f19 +Author: Dragana Damjanovic +Date: Wed Jan 27 01:47:00 2016 +0100 + + Bug 1243312 - nsNetCID is missing in toolkit/system/unixproxy/nsLibProxySettings.cpp. r=jduell +--- + toolkit/system/unixproxy/nsLibProxySettings.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git toolkit/system/unixproxy/nsLibProxySettings.cpp toolkit/system/unixproxy/nsLibProxySettings.cpp +index f6ec377..e9179c1 100644 +--- toolkit/system/unixproxy/nsLibProxySettings.cpp ++++ toolkit/system/unixproxy/nsLibProxySettings.cpp +@@ -9,6 +9,7 @@ + #include "nsIURI.h" + #include "nsString.h" + #include "nsCOMPtr.h" ++#include "nsNetCID.h" + #include "nspr.h" + + extern "C" { Copied: branches/2016Q2/www/seamonkey/files/patch-bug1243312 (from r414020, head/www/seamonkey/files/patch-bug1243312) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/www/seamonkey/files/patch-bug1243312 Mon Apr 25 16:26:46 2016 (r414021, copy of r414020, head/www/seamonkey/files/patch-bug1243312) @@ -0,0 +1,21 @@ +commit a5c6f19 +Author: Dragana Damjanovic +Date: Wed Jan 27 01:47:00 2016 +0100 + + Bug 1243312 - nsNetCID is missing in toolkit/system/unixproxy/nsLibProxySettings.cpp. r=jduell +--- + toolkit/system/unixproxy/nsLibProxySettings.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git toolkit/system/unixproxy/nsLibProxySettings.cpp toolkit/system/unixproxy/nsLibProxySettings.cpp +index f6ec377..e9179c1 100644 +--- mozilla/toolkit/system/unixproxy/nsLibProxySettings.cpp ++++ mozilla/toolkit/system/unixproxy/nsLibProxySettings.cpp +@@ -9,6 +9,7 @@ + #include "nsIURI.h" + #include "nsString.h" + #include "nsCOMPtr.h" ++#include "nsNetCID.h" + #include "nspr.h" + + extern "C" { From owner-svn-ports-branches@freebsd.org Tue Apr 26 17:49:20 2016 Return-Path: Delivered-To: svn-ports-branches@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 1B73BB1D7D1; Tue, 26 Apr 2016 17:49:20 +0000 (UTC) (envelope-from feld@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 DF02C1EDC; Tue, 26 Apr 2016 17:49:19 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3QHnJNL085675; Tue, 26 Apr 2016 17:49:19 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3QHnJ4K085674; Tue, 26 Apr 2016 17:49:19 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201604261749.u3QHnJ4K085674@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 26 Apr 2016 17:49:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414063 - branches/2016Q2/net-mgmt/unifi4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2016 17:49:20 -0000 Author: feld Date: Tue Apr 26 17:49:18 2016 New Revision: 414063 URL: https://svnweb.freebsd.org/changeset/ports/414063 Log: MFH: r414062 net-mgmt/unifi4: Add a LOCAL mirror for the distfiles Sometimes Ubiquiti updates and pulls old versions for no obvious reason and this causes the quarterly branch build process to repeatedly email me with errors. The license for Unifi does not restrict hosting copies of the distfile, so I will use a backup mirror will solve this. Approved by: ports-secteam (with hat) Modified: branches/2016Q2/net-mgmt/unifi4/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net-mgmt/unifi4/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/unifi4/Makefile Tue Apr 26 17:48:35 2016 (r414062) +++ branches/2016Q2/net-mgmt/unifi4/Makefile Tue Apr 26 17:49:18 2016 (r414063) @@ -5,7 +5,8 @@ PORTNAME= unifi4 PORTVERSION= 4.8.14 PORTREVISION= 0 CATEGORIES= net-mgmt java -MASTER_SITES= https://www.ubnt.com/downloads/unifi/${PORTVERSION}/ +MASTER_SITES= https://www.ubnt.com/downloads/unifi/${PORTVERSION}/ \ + LOCAL/feld/${PORTNAME}-${PORTVERSION}/ DISTNAME= UniFi.unix DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} From owner-svn-ports-branches@freebsd.org Tue Apr 26 20:50:41 2016 Return-Path: Delivered-To: svn-ports-branches@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 2467FB1DDA3; Tue, 26 Apr 2016 20:50:41 +0000 (UTC) (envelope-from feld@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 D9CF61287; Tue, 26 Apr 2016 20:50:40 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3QKoee0042011; Tue, 26 Apr 2016 20:50:40 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3QKodLo042008; Tue, 26 Apr 2016 20:50:39 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201604262050.u3QKodLo042008@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 26 Apr 2016 20:50:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414075 - branches/2016Q2/sysutils/mfid X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2016 20:50:41 -0000 Author: feld Date: Tue Apr 26 20:50:39 2016 New Revision: 414075 URL: https://svnweb.freebsd.org/changeset/ports/414075 Log: MFH: r414074 sysutils/mfid: Update to 0.02 The original implementation of mfid from Yahoo! disabled the RAID controller's Patrol Reads. The user is given no warning that this is happening. This update to mfid removes this functionality and comes with a large pkg-message warning to inform the user about the previous behavior as well as steps to re-enable Patrol Reads for their RAID card. Thank you to Terrence Koeman for noticing this behavior, and jhb for confirming the history of this code. While here, change the MASTER_SITE to my LOCAL distfiles location. Approved by: ports-secteam (with hat) Added: branches/2016Q2/sysutils/mfid/pkg-message - copied unchanged from r414074, head/sysutils/mfid/pkg-message Modified: branches/2016Q2/sysutils/mfid/Makefile branches/2016Q2/sysutils/mfid/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/sysutils/mfid/Makefile ============================================================================== --- branches/2016Q2/sysutils/mfid/Makefile Tue Apr 26 20:49:21 2016 (r414074) +++ branches/2016Q2/sysutils/mfid/Makefile Tue Apr 26 20:50:39 2016 (r414075) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= mfid -PORTVERSION= 0.01 +PORTVERSION= 0.02 CATEGORIES= sysutils -MASTER_SITES= https://www.glenbarber.us/ports/${CATEGORIES}/${PORTNAME}/ +MASTER_SITES= LOCAL/feld MAINTAINER= feld@FreeBSD.org COMMENT= Monitoring daemon for mfi RAID controllers Modified: branches/2016Q2/sysutils/mfid/distinfo ============================================================================== --- branches/2016Q2/sysutils/mfid/distinfo Tue Apr 26 20:49:21 2016 (r414074) +++ branches/2016Q2/sysutils/mfid/distinfo Tue Apr 26 20:50:39 2016 (r414075) @@ -1,2 +1,2 @@ -SHA256 (mfid-0.01.tar.gz) = 5f6814849555343620fd14fb3ce97448146e1b3f262b75c9696aa9de41772863 -SIZE (mfid-0.01.tar.gz) = 6535 +SHA256 (mfid-0.02.tar.gz) = 10c6bb1e46596fe1f30ddabb295ef2d5be1b38e9be1255f067a17189e3cc4a78 +SIZE (mfid-0.02.tar.gz) = 6342 Copied: branches/2016Q2/sysutils/mfid/pkg-message (from r414074, head/sysutils/mfid/pkg-message) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/sysutils/mfid/pkg-message Tue Apr 26 20:50:39 2016 (r414075, copy of r414074, head/sysutils/mfid/pkg-message) @@ -0,0 +1,33 @@ +! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! +! ! +! Please note that a previous version of mfid disabled the RAID ! +! controller's Patrol Reads. The original mfid implementation was ! +! used in a high performance environment without the need for the ! +! data safety and integrity features that Patrol Reads provide. ! +! ! +! If you value data safety and integrity over performance, you ! +! you should re-enable Patrol Reads. ! +! ! +! Check if patrol is disabled: ! +! ! +! # /usr/sbin/mfiutil -u 0 show patrol ! +! Operation Mode: disabled ! +! Runs Completed: 0 ! +! Current State: stopped ! +! ! +! ! +! Turn patrol back on: ! +! ! +! # /usr/sbin/mfiutil -u 0 patrol auto ! +! ! +! ! +! Confirm patrol status: ! +! ! +! # /usr/sbin/mfiutil -u 0 show patrol ! +! Operation Mode: auto ! +! Next Run Starts: Sat Apr 30 02:58:41 2016 ! +! Runs Start Every 604800 seconds ! +! Runs Completed: 0 ! +! Current State: stopped ! +! ! +! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! From owner-svn-ports-branches@freebsd.org Tue Apr 26 21:32:55 2016 Return-Path: Delivered-To: svn-ports-branches@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 148DDB1DCCC; Tue, 26 Apr 2016 21:32:55 +0000 (UTC) (envelope-from feld@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 D67A3143F; Tue, 26 Apr 2016 21:32:54 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3QLWsvZ058131; Tue, 26 Apr 2016 21:32:54 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3QLWrY0058129; Tue, 26 Apr 2016 21:32:53 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201604262132.u3QLWrY0058129@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 26 Apr 2016 21:32:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414083 - branches/2016Q2/sysutils/mfid X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2016 21:32:55 -0000 Author: feld Date: Tue Apr 26 21:32:53 2016 New Revision: 414083 URL: https://svnweb.freebsd.org/changeset/ports/414083 Log: MFH: r414082 sysutils/mfid: Update to 0.03 Previous update had a Makefile change to quiet a warning, but poudriere throws an error for setting MK_MAN Approved by: ports-secteam (with hat) Modified: branches/2016Q2/sysutils/mfid/Makefile branches/2016Q2/sysutils/mfid/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/sysutils/mfid/Makefile ============================================================================== --- branches/2016Q2/sysutils/mfid/Makefile Tue Apr 26 21:32:17 2016 (r414082) +++ branches/2016Q2/sysutils/mfid/Makefile Tue Apr 26 21:32:53 2016 (r414083) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mfid -PORTVERSION= 0.02 +PORTVERSION= 0.03 CATEGORIES= sysutils MASTER_SITES= LOCAL/feld Modified: branches/2016Q2/sysutils/mfid/distinfo ============================================================================== --- branches/2016Q2/sysutils/mfid/distinfo Tue Apr 26 21:32:17 2016 (r414082) +++ branches/2016Q2/sysutils/mfid/distinfo Tue Apr 26 21:32:53 2016 (r414083) @@ -1,2 +1,2 @@ -SHA256 (mfid-0.02.tar.gz) = 10c6bb1e46596fe1f30ddabb295ef2d5be1b38e9be1255f067a17189e3cc4a78 -SIZE (mfid-0.02.tar.gz) = 6342 +SHA256 (mfid-0.03.tar.gz) = 9ca8d9f37465a145b011f4e97db2c6878b78fd0453e63fbd42ab6d555f83dd7a +SIZE (mfid-0.03.tar.gz) = 6365 From owner-svn-ports-branches@freebsd.org Wed Apr 27 04:53:04 2016 Return-Path: Delivered-To: svn-ports-branches@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 176EFB1CE01; Wed, 27 Apr 2016 04:53:04 +0000 (UTC) (envelope-from delphij@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 DCEEA1F55; Wed, 27 Apr 2016 04:53:03 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3R4r37p091122; Wed, 27 Apr 2016 04:53:03 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3R4r2Nm091120; Wed, 27 Apr 2016 04:53:02 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201604270453.u3R4r2Nm091120@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 27 Apr 2016 04:53:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414088 - branches/2016Q2/net/ntp X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2016 04:53:04 -0000 Author: delphij Date: Wed Apr 27 04:53:02 2016 New Revision: 414088 URL: https://svnweb.freebsd.org/changeset/ports/414088 Log: MFH: r414087 Security update net/ntp to 4.2.8p7. Security: CVE-2015-7704 Security: CVE-2015-8138 Security: CVE-2016-1547 Security: CVE-2016-1548 Security: CVE-2016-1549 Security: CVE-2016-1550 Security: CVE-2016-1551 Security: CVE-2016-2516 Security: CVE-2016-2517 Security: CVE-2016-2518 Security: CVE-2016-2519 Security: b2487d9a-0c30-11e6-acd0-d050996490d0 Approved by: ports-secteam Modified: branches/2016Q2/net/ntp/Makefile branches/2016Q2/net/ntp/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net/ntp/Makefile ============================================================================== --- branches/2016Q2/net/ntp/Makefile Wed Apr 27 04:50:16 2016 (r414087) +++ branches/2016Q2/net/ntp/Makefile Wed Apr 27 04:53:02 2016 (r414088) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ntp -PORTVERSION= 4.2.8p6 +PORTVERSION= 4.2.8p7 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ \ Modified: branches/2016Q2/net/ntp/distinfo ============================================================================== --- branches/2016Q2/net/ntp/distinfo Wed Apr 27 04:50:16 2016 (r414087) +++ branches/2016Q2/net/ntp/distinfo Wed Apr 27 04:53:02 2016 (r414088) @@ -1,2 +1,2 @@ -SHA256 (ntp-4.2.8p6.tar.gz) = 583d0e1c573ace30a9c6afbea0fc52cae9c8c916dbc15c026e485a0dda4ba048 -SIZE (ntp-4.2.8p6.tar.gz) = 7152557 +SHA256 (ntp-4.2.8p7.tar.gz) = 81d20c06a0b01abe3b84fac092185bf014252d38fe5e7b2758f604680a0220dc +SIZE (ntp-4.2.8p7.tar.gz) = 7175313 From owner-svn-ports-branches@freebsd.org Wed Apr 27 11:06:02 2016 Return-Path: Delivered-To: svn-ports-branches@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 516FDB1D9FB; Wed, 27 Apr 2016 11:06:02 +0000 (UTC) (envelope-from dim@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 0781F1B4E; Wed, 27 Apr 2016 11:06:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3RB619q002826; Wed, 27 Apr 2016 11:06:01 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3RB61A2002825; Wed, 27 Apr 2016 11:06:01 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201604271106.u3RB61A2002825@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 27 Apr 2016 11:06:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414098 - branches/2016Q2/dns/powerdns/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2016 11:06:02 -0000 Author: dim (src committer) Date: Wed Apr 27 11:06:00 2016 New Revision: 414098 URL: https://svnweb.freebsd.org/changeset/ports/414098 Log: MFH: r414065 During the exp-run in bug 208158, it was found that dns/powerdns gives errors with libc++ 3.8.0: dnspacket.cc:645:6: error: call to 'abs' is ambiguous if(abs(trc->d_time - now) > trc->d_fudge) { ^~~ This is because abs() is being called with unsigned arguments. Import upstream commit f2d05dd to fix it. Approved by: portmgr (junovitch) PR: 208725 Added: branches/2016Q2/dns/powerdns/files/patch-pdns_dnspacket.cc - copied unchanged from r414065, head/dns/powerdns/files/patch-pdns_dnspacket.cc Modified: Directory Properties: branches/2016Q2/ (props changed) Copied: branches/2016Q2/dns/powerdns/files/patch-pdns_dnspacket.cc (from r414065, head/dns/powerdns/files/patch-pdns_dnspacket.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/dns/powerdns/files/patch-pdns_dnspacket.cc Wed Apr 27 11:06:00 2016 (r414098, copy of r414065, head/dns/powerdns/files/patch-pdns_dnspacket.cc) @@ -0,0 +1,15 @@ +--- pdns/dnspacket.cc.orig 2015-11-02 10:33:21 UTC ++++ pdns/dnspacket.cc +@@ -641,9 +641,9 @@ bool checkForCorrectTSIG(const DNSPacket + string message; + + q->getTSIGDetails(trc, keyname, &message); +- uint64_t now = time(0); +- if(abs(trc->d_time - now) > trc->d_fudge) { +- L<qdomain<<"' denied: TSIG (key '"<<*keyname<<"') time delta "<< abs(trc->d_time - now)<<" > 'fudge' "<d_fudge<d_time - (int64_t)time(0)); ++ if(delta > trc->d_fudge) { ++ L<qdomain<<"' denied: TSIG (key '"<<*keyname<<"') time delta "<< delta <<" > 'fudge' "<d_fudge< Delivered-To: svn-ports-branches@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 31D7BB1DA88; Wed, 27 Apr 2016 11:07:23 +0000 (UTC) (envelope-from dim@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 0E4C51CF8; Wed, 27 Apr 2016 11:07:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3RB7MUA003132; Wed, 27 Apr 2016 11:07:22 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3RB7LG3003124; Wed, 27 Apr 2016 11:07:21 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201604271107.u3RB7LG3003124@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 27 Apr 2016 11:07:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414099 - in branches/2016Q2/lang: python27 python27/files python33 python33/files python34 python34/files python35 python35/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2016 11:07:23 -0000 Author: dim (src committer) Date: Wed Apr 27 11:07:21 2016 New Revision: 414099 URL: https://svnweb.freebsd.org/changeset/ports/414099 Log: MFH: r414029 For the various lang/python* ports, improve the __FreeBSD_version check in pyport.h for working around a very old ctype issue. If the workaround for this issue is enabled, pyport.h redefines toupper() and some other ctype macros, and this wreaks havoc when including newer libc++ headers (or any other system header which tries to declare those functions). Approved by: portmgr (junovitch) PR: 208486 Added: branches/2016Q2/lang/python27/files/patch-Include__pyport.h - copied unchanged from r414029, head/lang/python27/files/patch-Include__pyport.h branches/2016Q2/lang/python33/files/patch-Include__pyport.h - copied unchanged from r414029, head/lang/python33/files/patch-Include__pyport.h branches/2016Q2/lang/python34/files/patch-Include__pyport.h - copied unchanged from r414029, head/lang/python34/files/patch-Include__pyport.h branches/2016Q2/lang/python35/files/patch-Include__pyport.h - copied unchanged from r414029, head/lang/python35/files/patch-Include__pyport.h Modified: branches/2016Q2/lang/python27/Makefile branches/2016Q2/lang/python33/Makefile branches/2016Q2/lang/python34/Makefile branches/2016Q2/lang/python35/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/lang/python27/Makefile ============================================================================== --- branches/2016Q2/lang/python27/Makefile Wed Apr 27 11:06:00 2016 (r414098) +++ branches/2016Q2/lang/python27/Makefile Wed Apr 27 11:07:21 2016 (r414099) @@ -2,7 +2,7 @@ PORTNAME= python27 PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} Copied: branches/2016Q2/lang/python27/files/patch-Include__pyport.h (from r414029, head/lang/python27/files/patch-Include__pyport.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/lang/python27/files/patch-Include__pyport.h Wed Apr 27 11:07:21 2016 (r414099, copy of r414029, head/lang/python27/files/patch-Include__pyport.h) @@ -0,0 +1,13 @@ +--- Include/pyport.h.orig 2015-12-05 20:46:54.000000000 +0100 ++++ Include/pyport.h 2016-04-03 17:14:53.047412000 +0200 +@@ -702,7 +702,9 @@ + + #ifdef __FreeBSD__ + #include +-#if __FreeBSD_version > 500039 ++#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \ ++ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \ ++ (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001) + # define _PY_PORT_CTYPE_UTF8_ISSUE + #endif + #endif Modified: branches/2016Q2/lang/python33/Makefile ============================================================================== --- branches/2016Q2/lang/python33/Makefile Wed Apr 27 11:06:00 2016 (r414098) +++ branches/2016Q2/lang/python33/Makefile Wed Apr 27 11:07:21 2016 (r414099) @@ -2,7 +2,7 @@ PORTNAME= python33 PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} Copied: branches/2016Q2/lang/python33/files/patch-Include__pyport.h (from r414029, head/lang/python33/files/patch-Include__pyport.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/lang/python33/files/patch-Include__pyport.h Wed Apr 27 11:07:21 2016 (r414099, copy of r414029, head/lang/python33/files/patch-Include__pyport.h) @@ -0,0 +1,13 @@ +--- Include/pyport.h.orig 2014-10-12 09:03:52.000000000 +0200 ++++ Include/pyport.h 2016-04-03 19:26:20.938539000 +0200 +@@ -686,7 +686,9 @@ + + #ifdef __FreeBSD__ + #include +-#if __FreeBSD_version > 500039 ++#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \ ++ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \ ++ (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001) + # define _PY_PORT_CTYPE_UTF8_ISSUE + #endif + #endif Modified: branches/2016Q2/lang/python34/Makefile ============================================================================== --- branches/2016Q2/lang/python34/Makefile Wed Apr 27 11:06:00 2016 (r414098) +++ branches/2016Q2/lang/python34/Makefile Wed Apr 27 11:07:21 2016 (r414099) @@ -3,7 +3,7 @@ PORTNAME= python34 PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} Copied: branches/2016Q2/lang/python34/files/patch-Include__pyport.h (from r414029, head/lang/python34/files/patch-Include__pyport.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/lang/python34/files/patch-Include__pyport.h Wed Apr 27 11:07:21 2016 (r414099, copy of r414029, head/lang/python34/files/patch-Include__pyport.h) @@ -0,0 +1,13 @@ +--- Include/pyport.h.orig 2015-12-21 07:00:57.000000000 +0100 ++++ Include/pyport.h 2016-04-03 19:29:17.797369000 +0200 +@@ -680,7 +680,9 @@ + + #ifdef __FreeBSD__ + #include +-#if __FreeBSD_version > 500039 ++#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \ ++ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \ ++ (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001) + # define _PY_PORT_CTYPE_UTF8_ISSUE + #endif + #endif Modified: branches/2016Q2/lang/python35/Makefile ============================================================================== --- branches/2016Q2/lang/python35/Makefile Wed Apr 27 11:06:00 2016 (r414098) +++ branches/2016Q2/lang/python35/Makefile Wed Apr 27 11:07:21 2016 (r414099) @@ -3,7 +3,7 @@ PORTNAME= python DISTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PYTHON_PORTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} Copied: branches/2016Q2/lang/python35/files/patch-Include__pyport.h (from r414029, head/lang/python35/files/patch-Include__pyport.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/lang/python35/files/patch-Include__pyport.h Wed Apr 27 11:07:21 2016 (r414099, copy of r414029, head/lang/python35/files/patch-Include__pyport.h) @@ -0,0 +1,13 @@ +--- Include/pyport.h.orig 2015-12-07 02:39:07.000000000 +0100 ++++ Include/pyport.h 2016-04-03 19:31:36.801717000 +0200 +@@ -677,7 +677,9 @@ + + #ifdef __FreeBSD__ + #include +-#if __FreeBSD_version > 500039 ++#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \ ++ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \ ++ (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001) + # define _PY_PORT_CTYPE_UTF8_ISSUE + #endif + #endif From owner-svn-ports-branches@freebsd.org Thu Apr 28 01:01:39 2016 Return-Path: Delivered-To: svn-ports-branches@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 05072B1E3B2; Thu, 28 Apr 2016 01:01:39 +0000 (UTC) (envelope-from junovitch@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 D12551656; Thu, 28 Apr 2016 01:01:38 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3S11bHW012354; Thu, 28 Apr 2016 01:01:37 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3S11bs4012352; Thu, 28 Apr 2016 01:01:37 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604280101.u3S11bs4012352@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Thu, 28 Apr 2016 01:01:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414151 - branches/2016Q2/ftp/proftpd X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2016 01:01:39 -0000 Author: junovitch Date: Thu Apr 28 01:01:37 2016 New Revision: 414151 URL: https://svnweb.freebsd.org/changeset/ports/414151 Log: MFH: r413681 Update proftpd to 1.3.5b Optionsify port PR: 208909 Security: CVE-2016-3125 Security: https://vuxml.FreeBSD.org/freebsd/a733b5ca-06eb-11e6-817f-3085a9a4510d.html Approved by: ports-secteam (with hat) Modified: branches/2016Q2/ftp/proftpd/Makefile branches/2016Q2/ftp/proftpd/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/ftp/proftpd/Makefile ============================================================================== --- branches/2016Q2/ftp/proftpd/Makefile Thu Apr 28 00:56:34 2016 (r414150) +++ branches/2016Q2/ftp/proftpd/Makefile Thu Apr 28 01:01:37 2016 (r414151) @@ -26,7 +26,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/sbin/proftp RUN_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd .endif -PROFTPD_VERSION= 1.3.5a +PROFTPD_VERSION= 1.3.5b .if defined(_BUILDING_PROFTPD_MODULE) DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} @@ -93,11 +93,10 @@ HTMLDOCS_DESC= Include HTML documentati MEMCACHE_DESC= Memcache support using libmemcached PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}" +OPTIONS_SUB= yes .endif #!defined(_BUILDING_PROFTPD_MODULE) -.include - .if !defined(_BUILDING_PROFTPD_MODULE) CPPFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} LIBS+= -lssl -lcrypto -L${OPENSSLLIB} @@ -142,38 +141,18 @@ MODULES+= mod_ban \ mod_wrap2_file \ mod_wrap2_sql -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif +IPV6_CONFIGURE_ENABLE=ipv6 -.if ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+= --enable-nls -USES+= gettext iconv -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +NLS_CONFIGURE_ON= --enable-nls +NLS_USES= gettext iconv -.if ${PORT_OPTIONS:MPCRE} -LIB_DEPENDS+= libpcre.so:devel/pcre -CONFIGURE_ARGS+= --enable-pcre -.else -CONFIGURE_ARGS+= --disable-pcre -.endif +PCRE_CONFIGURE_ENABLE= pcre +PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -.if ${PORT_OPTIONS:MMEMCACHE} -MODULES+= mod_memcache \ - mod_tls_memcache -LIB_DEPENDS+= libmemcached.so:databases/libmemcached -CONFIGURE_ARGS+= --enable-memcache -LIBS+= -L${LOCALBASE}/lib -lmemcached -lmemcachedutil -PLIST_SUB+= MEMCACHE="" -.else -CONFIGURE_ARGS+= --disable-memcache -PLIST_SUB+= MEMCACHE="@comment " -.endif +MEMCACHE_LIB_DEPENDS= libmemcached.so:databases/libmemcached +MEMCACHE_CONFIGURE_ENABLE= memcache +MEMCACHE_VARS= MODULES+="mod_memcache mod_tls_memcache" \ + LIBS+="-L${LOCALBASE}/lib -lmemcached -lmemcachedutil" # Generate modules configuration string .for m in ${MODULES} @@ -192,7 +171,7 @@ CONFIGURE_ARGS+= --with-libraries=${LIBD .if !defined(_BUILDING_PROFTPD_MODULE) -.if empty(ICONV_LIB) +.if empty(ICONV_PREFIX) CONFIGURE_ARGS+= ac_cv_lib_iconv_iconv_open=no \ ac_cv_lib_iconv_libiconv_open=no .endif Modified: branches/2016Q2/ftp/proftpd/distinfo ============================================================================== --- branches/2016Q2/ftp/proftpd/distinfo Thu Apr 28 00:56:34 2016 (r414150) +++ branches/2016Q2/ftp/proftpd/distinfo Thu Apr 28 01:01:37 2016 (r414151) @@ -1,5 +1,5 @@ -SHA256 (proftpd-1.3.5a.tar.gz) = a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696 -SIZE (proftpd-1.3.5a.tar.gz) = 29988477 +SHA256 (proftpd-1.3.5b.tar.gz) = afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d044b4fc8 +SIZE (proftpd-1.3.5b.tar.gz) = 29992107 SHA256 (mod_clamav-v0.13.tar.gz) = 7f60bebbb58836319bf249be77540efc6667a55caca8aaba164e6a61cd0c3db7 SIZE (mod_clamav-v0.13.tar.gz) = 11683 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08 From owner-svn-ports-branches@freebsd.org Thu Apr 28 03:28:40 2016 Return-Path: Delivered-To: svn-ports-branches@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 6DABAB1F9A1; Thu, 28 Apr 2016 03:28:40 +0000 (UTC) (envelope-from ohauer@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 2E26214E2; Thu, 28 Apr 2016 03:28:40 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3S3SdB1055540; Thu, 28 Apr 2016 03:28:39 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3S3SdiD055538; Thu, 28 Apr 2016 03:28:39 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201604280328.u3S3SdiD055538@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Thu, 28 Apr 2016 03:28:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414155 - branches/2016Q2/devel/bugzilla50 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2016 03:28:40 -0000 Author: ohauer Date: Thu Apr 28 03:28:39 2016 New Revision: 414155 URL: https://svnweb.freebsd.org/changeset/ports/414155 Log: MFH: r413850 r414123 - Remove unnecessary PERL_LEVEL check - Add NO_ARCH - Convert to new options helper - Use bsd.port.mk instead of bsd.port.pre.mk + bsd.port.post.mk With hat: perl Approved by: portmgr (blanket) - fix build with PostgreSQL (s/91/9.1/) as default db (PD error: cannot install: unknown PostgreSQL version: 91+) Approved by: ports-secteam (junovitch@) Modified: branches/2016Q2/devel/bugzilla50/Makefile branches/2016Q2/devel/bugzilla50/Makefile.common Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/bugzilla50/Makefile ============================================================================== --- branches/2016Q2/devel/bugzilla50/Makefile Thu Apr 28 02:43:53 2016 (r414154) +++ branches/2016Q2/devel/bugzilla50/Makefile Thu Apr 28 03:28:39 2016 (r414155) @@ -12,6 +12,8 @@ COMMENT= Bug-tracking system developed b LICENSE= MPL # see Bugzilla/Install/Requirements.pm +# PR 194782: silence Module::Pluggable deprecated warnings +# PR 196060,196100: explicitly depend on textproc/p5-Text-Tabv RUN_DEPENDS= \ p5-CGI>=3.51:www/p5-CGI \ p5-DBI>=1.614:databases/p5-DBI \ @@ -24,7 +26,9 @@ RUN_DEPENDS= \ p5-JSON-XS>=2.01:converters/p5-JSON-XS \ p5-List-MoreUtils>=0.32:lang/p5-List-MoreUtils \ p5-Math-Random-ISAAC>=1.001:math/p5-Math-Random-ISAAC \ + p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable \ p5-Template-Toolkit>=2.24:www/p5-Template-Toolkit \ + p5-Text-Tabs+Wrap>=2013.0523:textproc/p5-Text-Tabs+Wrap \ p5-TimeDate>=2.23:devel/p5-TimeDate \ p5-URI>=1.55:net/p5-URI @@ -42,132 +46,57 @@ EMPTY_DIRS_LIST=data graphs contrib lib .include "${.CURDIR}/Makefile.common" .include "${.CURDIR}/Makefile.options" -.include - -.include -.if ${PERL_LEVEL} >= 501800 -# PR 194782: silence Module::Pluggable deprecated warnings -RUN_DEPENDS+= p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable -# PR 196060,196100: explicitly depend on textproc/p5-Text-Tabv -RUN_DEPENDS+= p5-Text-Tabs+Wrap>=2013.0523:textproc/p5-Text-Tabs+Wrap -.endif - -.if ${PORT_OPTIONS:MMODPERL} -USE_APACHE_RUN= 22+ -.endif - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -RUN_DEPENDS+= p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql:91+ -RUN_DEPENDS+= p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg -.endif - -.if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes -RUN_DEPENDS+= p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \ - sqlite3>=3:databases/sqlite3 -.endif - -.if ${PORT_OPTIONS:MGRAPH_REPORTS} -RUN_DEPENDS+= p5-GD>=1.20:graphics/p5-GD \ - p5-GD-Graph>=0:graphics/p5-GD-Graph \ - p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \ - p5-Template-GD>=0:www/p5-Template-GD -.endif - -.if ${PORT_OPTIONS:MCHARTING_MODULES} -RUN_DEPENDS+= p5-Chart>=2.4.10:graphics/p5-Chart -.endif - -.if ${PORT_OPTIONS:MPATCH_VIEWER} -RUN_DEPENDS+= p5-PatchReader>=0.9.6:devel/p5-PatchReader \ - interdiff:misc/patchutils -.endif - -.if ${PORT_OPTIONS:MMORE_HTML} -RUN_DEPENDS+= p5-HTML-Parser>=3.67:www/p5-HTML-Parser \ - p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber -.endif - -.if ${PORT_OPTIONS:MINBOUND_EMAIL} -RUN_DEPENDS+= p5-Email-MIME-Attachment-Stripper>=0:mail/p5-Email-MIME-Attachment-Stripper \ - p5-Email-Reply>=0:mail/p5-Email-Reply \ - p5-HTML-FormatText-WithLinks>=0.13:textproc/p5-HTML-FormatText-WithLinks -.endif - -.if ${PORT_OPTIONS:MMAIL_QUEUEING} -RUN_DEPENDS+= p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \ - p5-Daemon-Generic>=0:net/p5-Daemon-Generic -.endif - -.if ${PORT_OPTIONS:MMOVE_BUGZ} -RUN_DEPENDS+= p5-MIME-Tools>=5.406:mail/p5-MIME-Tools \ - p5-XML-Twig>=0:textproc/p5-XML-Twig -.endif - -.if ${PORT_OPTIONS:MBMP2PNG} -RUN_DEPENDS+= convert:graphics/ImageMagick -.endif +MODPERL_USE= APACHE_RUN=22+ +MYSQL_USE= MYSQL=yes +MYSQL_RUN_DEPENDS= p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql +PGSQL_USES= pgsql:9.1+ +PGSQL_RUN_DEPENDS= p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg +SQLITE_USES= sqlite +SQLITE_RUN_DEPENDS= p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \ + sqlite3>=3:databases/sqlite3 +GRAPH_REPORTS_RUN_DEPENDS= p5-GD>=1.20:graphics/p5-GD \ + p5-GD-Graph>=0:graphics/p5-GD-Graph \ + p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \ + p5-Template-GD>=0:www/p5-Template-GD +CHARTING_MODULES_RUN_DEPENDS= p5-Chart>=2.4.10:graphics/p5-Chart +PATCH_VIEWER_RUN_DEPENDS= p5-PatchReader>=0.9.6:devel/p5-PatchReader \ + interdiff:misc/patchutils +MORE_HTML_RUN_DEPENDS= p5-HTML-Parser>=3.67:www/p5-HTML-Parser \ + p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber +INBOUND_EMAIL_RUN_DEPENDS= p5-Email-MIME-Attachment-Stripper>=0:mail/p5-Email-MIME-Attachment-Stripper \ + p5-Email-Reply>=0:mail/p5-Email-Reply \ + p5-HTML-FormatText-WithLinks>=0.13:textproc/p5-HTML-FormatText-WithLinks +MAIL_QUEUEING_RUN_DEPENDS= p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \ + p5-Daemon-Generic>=0:net/p5-Daemon-Generic +MOVE_BUGZ_RUN_DEPENDS= p5-MIME-Tools>=5.406:mail/p5-MIME-Tools \ + p5-XML-Twig>=0:textproc/p5-XML-Twig +BMP2PNG_RUN_DEPENDS= convert:graphics/ImageMagick # Note: XML-RPC and JSON-RPC are deprecated in favor of REST # and will likely be removed in the Bugzilla 7.0 release. -.if ${PORT_OPTIONS:MXMLRPC} || ${PORT_OPTIONS:MJSONRPC} || ${PORT_OPTIONS:MREST} -RUN_DEPENDS+= p5-Test-Taint>=1.06:devel/p5-Test-Taint -.endif - -.if ${PORT_OPTIONS:MXMLRPC} -RUN_DEPENDS+= p5-XMLRPC-Lite>=0.712:net/p5-XMLRPC-Lite # XXX SOAP::Lite can be removed if upstream officially depends on # XMLRPC::Lite>=0.717, see Bugzilla/Install/Requirements.pm -RUN_DEPENDS+= p5-SOAP-Lite>=0.712:net/p5-SOAP-Lite -.endif +XMLRPC_RUN_DEPENDS= p5-Test-Taint>=1.06:devel/p5-Test-Taint \ + p5-XMLRPC-Lite>=0.712:net/p5-XMLRPC-Lite \ + p5-SOAP-Lite>=0.712:net/p5-SOAP-Lite +JSONRPC_RUN_DEPENDS= p5-Test-Taint>=1.06:devel/p5-Test-Taint \ + p5-JSON-RPC>=0:devel/p5-JSON-RPC +REST_RUN_DEPENDS= p5-Test-Taint>=1.06:devel/p5-Test-Taint \ + p5-JSON-RPC>=0:devel/p5-JSON-RPC +MODPERL_RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \ + p5-Apache-DBI>=0:www/p5-Apache-DBI +GRAPHVIZ_RUN_DEPENDS= dot:graphics/graphviz +EXPORT_IMPORT_RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ + p5-XML-Twig>=0:textproc/p5-XML-Twig +LDAP_RUN_DEPENDS= p5-perl-ldap>=0:net/p5-perl-ldap +RADIUS_RUN_DEPENDS= p5-Authen-Radius>=0:security/p5-Authen-Radius +SMTP_AUTH_RUN_DEPENDS= p5-Authen-SASL>=2.16:security/p5-Authen-SASL +SMTP_SSL_RUN_DEPENDS= p5-Net-SMTP-SSL>=1.01:mail/p5-Net-SMTP-SSL +MIME_SNIFF_RUN_DEPENDS= p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \ + p5-IO-stringy>=2.110:devel/p5-IO-stringy +MEMCACHED_RUN_DEPENDS= p5-Cache-Memcached>=1.30:databases/p5-Cache-Memcached -.if ${PORT_OPTIONS:MJSONRPC} || ${PORT_OPTIONS:MREST} -RUN_DEPENDS+= p5-JSON-RPC>=0:devel/p5-JSON-RPC -.endif - -.if ${PORT_OPTIONS:MMODPERL} -RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \ - p5-Apache-DBI>=0:www/p5-Apache-DBI -.endif - -.if ${PORT_OPTIONS:MGRAPHVIZ} -RUN_DEPENDS+= dot:graphics/graphviz -.endif - -.if ${PORT_OPTIONS:MEXPORT_IMPORT} -RUN_DEPENDS+= p5-XML-Parser>=0:textproc/p5-XML-Parser \ - p5-XML-Twig>=0:textproc/p5-XML-Twig -.endif - -.if ${PORT_OPTIONS:MLDAP} -RUN_DEPENDS+= p5-perl-ldap>=0:net/p5-perl-ldap -.endif - -.if ${PORT_OPTIONS:MRADIUS} -RUN_DEPENDS+= p5-Authen-Radius>=0:security/p5-Authen-Radius -.endif - -.if ${PORT_OPTIONS:MSMTP_AUTH} -RUN_DEPENDS+= p5-Authen-SASL>=2.16:security/p5-Authen-SASL -.endif - -.if ${PORT_OPTIONS:MSMTP_SSL} -RUN_DEPENDS+= p5-Net-SMTP-SSL>=1.01:mail/p5-Net-SMTP-SSL -.endif - -.if ${PORT_OPTIONS:MMIME_SNIFF} -RUN_DEPENDS+= p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \ - p5-IO-stringy>=2.110:devel/p5-IO-stringy -.endif - -.if ${PORT_OPTIONS:MMEMCACHED} -RUN_DEPENDS+= p5-Cache-Memcached>=1.30:databases/p5-Cache-Memcached -.endif +.include post-extract: # The docs_urlbase parameter has been removed. If documentation has not been @@ -215,4 +144,4 @@ do-install-VOTING-on: @${MKDIR} ${STAGEDIR}${WWWDIR}/extensions/Voting (cd ${WRKSRC}/extensions/Voting && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/extensions/Voting) -.include +.include Modified: branches/2016Q2/devel/bugzilla50/Makefile.common ============================================================================== --- branches/2016Q2/devel/bugzilla50/Makefile.common Thu Apr 28 02:43:53 2016 (r414154) +++ branches/2016Q2/devel/bugzilla50/Makefile.common Thu Apr 28 03:28:39 2016 (r414155) @@ -13,5 +13,6 @@ WWWDIR= ${PREFIX}/www/bugzilla BINMODE= 700 +NO_ARCH= yes NO_BUILD= yes From owner-svn-ports-branches@freebsd.org Thu Apr 28 16:59:28 2016 Return-Path: Delivered-To: svn-ports-branches@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 D0B95B1F366; Thu, 28 Apr 2016 16:59:28 +0000 (UTC) (envelope-from lme@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 A158A18BF; Thu, 28 Apr 2016 16:59:28 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3SGxRAX000485; Thu, 28 Apr 2016 16:59:27 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3SGxRVo000477; Thu, 28 Apr 2016 16:59:27 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604281659.u3SGxRVo000477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Thu, 28 Apr 2016 16:59:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414185 - in branches/2016Q2/sysutils/conky: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2016 16:59:28 -0000 Author: lme Date: Thu Apr 28 16:59:27 2016 New Revision: 414185 URL: https://svnweb.freebsd.org/changeset/ports/414185 Log: MFH: r414044 - Fix battery percentage calculation and add support for ${battery_short} and ${battery_bar} [1] - Remove a bogus __FreeBSD_kernel__ check in freebsd.c - Re-gen patches with "make makepatch" - Bump PORTREVISION PR: 208651 [1] Submitted by: Helge Oldach Approved by: maintainer timeout (17 days) Approved by: ports-secteam (junovich) Modified: branches/2016Q2/sysutils/conky/Makefile branches/2016Q2/sysutils/conky/files/patch-configure branches/2016Q2/sysutils/conky/files/patch-lua-cairo.pkg branches/2016Q2/sysutils/conky/files/patch-src-conky.c branches/2016Q2/sysutils/conky/files/patch-src-freebsd.c branches/2016Q2/sysutils/conky/files/patch-src-freebsd.h branches/2016Q2/sysutils/conky/files/patch-src-fs.c Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/sysutils/conky/Makefile ============================================================================== --- branches/2016Q2/sysutils/conky/Makefile Thu Apr 28 16:53:46 2016 (r414184) +++ branches/2016Q2/sysutils/conky/Makefile Thu Apr 28 16:59:27 2016 (r414185) @@ -3,7 +3,7 @@ PORTNAME= conky PORTVERSION= 1.9.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= SF Modified: branches/2016Q2/sysutils/conky/files/patch-configure ============================================================================== --- branches/2016Q2/sysutils/conky/files/patch-configure Thu Apr 28 16:53:46 2016 (r414184) +++ branches/2016Q2/sysutils/conky/files/patch-configure Thu Apr 28 16:59:27 2016 (r414185) @@ -1,6 +1,6 @@ ---- configure.orig 2012-05-04 00:47:40.000000000 +0300 -+++ configure 2012-12-06 04:26:37.000000000 +0200 -@@ -895,6 +895,7 @@ +--- configure.orig 2012-05-03 21:47:40 UTC ++++ configure +@@ -895,6 +895,7 @@ enable_xdamage enable_xft enable_nvidia enable_alsa @@ -8,7 +8,7 @@ enable_debug enable_testing enable_profiling -@@ -1620,6 +1621,7 @@ +@@ -1620,6 +1621,7 @@ Optional Features: --enable-nvidia enable if you want nvidia support [default=no] --disable-alsa disable if you do not want ALSA support [default=yes] @@ -16,7 +16,7 @@ --enable-debug compile with debug symbols [default=no] --enable-testing use strict compiler flags for testing [default=no] --enable-profiling specify compiler flags for use with gprof and gcov -@@ -11930,7 +11932,11 @@ +@@ -11930,7 +11932,11 @@ case $uname in Linux*) WANT_SYSINFO=yes ;; @@ -29,7 +29,207 @@ WANT_KVM=yes WANT_DEVSTAT=yes WANT_OPTRESET=yes -@@ -16998,18 +17004,63 @@ +@@ -14046,12 +14052,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null` ++ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14064,12 +14070,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_LUA51_LIBS="$LUA51_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null` ++ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14088,14 +14094,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"` ++ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"` + else +- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"` ++ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LUA51_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met: ++ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met: + + $LUA51_PKG_ERRORS + +@@ -14139,12 +14145,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null` ++ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14157,12 +14163,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_LUA51_LIBS="$LUA51_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null` ++ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14181,14 +14187,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"` ++ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"` + else +- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"` ++ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LUA51_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met: ++ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met: + + $LUA51_PKG_ERRORS + +@@ -14302,12 +14308,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null` ++ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14320,12 +14326,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_LUA51_LIBS="$LUA51_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null` ++ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14344,14 +14350,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"` ++ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"` + else +- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"` ++ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LUA51_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met: ++ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met: + + $LUA51_PKG_ERRORS + +@@ -14395,12 +14401,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null` ++ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14413,12 +14419,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_LUA51_LIBS="$LUA51_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null` ++ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14437,14 +14443,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"` ++ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"` + else +- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"` ++ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LUA51_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met: ++ as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met: + + $LUA51_PKG_ERRORS + +@@ -16998,18 +17004,63 @@ fi done @@ -55,8 +255,8 @@ +else + want_inotify=no +fi - - fi ++ ++fi +if test x$want_inotify = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify_init in -linotify" >&5 +$as_echo_n "checking for inotify_init in -linotify... " >&6; } @@ -67,10 +267,9 @@ +LIBS="-linotify $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - --done -+#include + ++#include + +char inotify_init (); +int +main () @@ -95,8 +294,9 @@ + conky_LIBS="$conky_LIBS -linotify" +else + want_inotify=yes -+fi -+ + fi + +-done +fi Modified: branches/2016Q2/sysutils/conky/files/patch-lua-cairo.pkg ============================================================================== --- branches/2016Q2/sysutils/conky/files/patch-lua-cairo.pkg Thu Apr 28 16:53:46 2016 (r414184) +++ branches/2016Q2/sysutils/conky/files/patch-lua-cairo.pkg Thu Apr 28 16:59:27 2016 (r414185) @@ -1,6 +1,6 @@ ---- lua/cairo.pkg.orig +--- lua/cairo.pkg.orig 2012-05-03 21:08:27 UTC +++ lua/cairo.pkg -@@ -4,6 +4,7 @@ +@@ -4,6 +4,7 @@ $#include $#include $#include $#include "libcairo-helper.h" Modified: branches/2016Q2/sysutils/conky/files/patch-src-conky.c ============================================================================== --- branches/2016Q2/sysutils/conky/files/patch-src-conky.c Thu Apr 28 16:53:46 2016 (r414184) +++ branches/2016Q2/sysutils/conky/files/patch-src-conky.c Thu Apr 28 16:59:27 2016 (r414185) @@ -1,5 +1,5 @@ ---- src/conky.c.orig 2012-05-04 00:22:21.000000000 +0300 -+++ src/conky.c 2012-12-04 11:09:20.000000000 +0200 +--- src/conky.c.orig 2012-05-03 21:22:21 UTC ++++ src/conky.c @@ -119,7 +119,7 @@ #include "openbsd.h" #endif @@ -9,7 +9,7 @@ #include #endif -@@ -4292,7 +4292,8 @@ +@@ -4292,7 +4292,8 @@ static void set_default_configurations(v free_templates(); @@ -19,7 +19,7 @@ { char buf[256]; -@@ -5662,6 +5663,7 @@ +@@ -5662,6 +5663,7 @@ void initialisation(int argc, char **arg current_mail_spool = strndup(buf, text_buffer_size); } } @@ -27,7 +27,7 @@ #endif /* handle other command line arguments */ -@@ -5971,7 +5973,7 @@ +@@ -5971,7 +5973,7 @@ int main(int argc, char **argv) void alarm_handler(void) { if(childpid > 0) { Modified: branches/2016Q2/sysutils/conky/files/patch-src-freebsd.c ============================================================================== --- branches/2016Q2/sysutils/conky/files/patch-src-freebsd.c Thu Apr 28 16:53:46 2016 (r414184) +++ branches/2016Q2/sysutils/conky/files/patch-src-freebsd.c Thu Apr 28 16:59:27 2016 (r414185) @@ -1,64 +1,71 @@ ---- src/freebsd.c.orig 2012-05-04 06:08:27.000000000 +0900 -+++ src/freebsd.c 2013-08-05 09:02:37.000000000 +0900 -@@ -38,6 +38,11 @@ - #include - #include - -+#if defined(__FreeBSD__) && (!defined(__FreeBSD_kernel__) || !(__FreeBSD_kernel__ + 0)) -+# undef __FreeBSD_kernel__ -+# define __FreeBSD_kernel__ __FreeBSD__ -+#endif -+ - #include - #include - #include -@@ -283,7 +288,7 @@ +--- src/freebsd.c.orig 2012-05-03 21:08:27 UTC ++++ src/freebsd.c +@@ -283,11 +283,7 @@ int update_running_processes(void) pthread_mutex_lock(&kvm_proc_mutex); p = kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes); for (i = 0; i < n_processes; i++) { -#if (__FreeBSD__ < 5) && (__FreeBSD_kernel__ < 5) -+#if (defined(__FreeBSD__) && (__FreeBSD__ < 5)) || (defined(__FreeBSD_kernel__) && (__FreeBSD_kernel__ < 5)) - if (p[i].kp_proc.p_stat == SRUN) { - #else +- if (p[i].kp_proc.p_stat == SRUN) { +-#else if (p[i].ki_stat == SRUN) { -@@ -300,7 +305,9 @@ - void get_cpu_count(void) - { - int cpu_count = 0; -- size_t cpu_count_len = sizeof(cpu_count); -+ /* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */ -+ if ((cpu_setup == 1) && (info.cpu_usage)) -+ return; - - if (GETSYSCTL("hw.ncpu", cpu_count) == 0) { - info.cpu_count = cpu_count; -@@ -313,6 +320,7 @@ - if (info.cpu_usage == NULL) { - CRIT_ERR(NULL, NULL, "malloc"); +-#endif + cnt++; + } } -+ cpu_setup = 1; - } - - struct cpu_info { -@@ -330,11 +338,7 @@ - unsigned int malloc_cpu_size = 0; - extern void* global_cpu; +@@ -464,7 +460,7 @@ void get_battery_stuff(char *buf, unsign + break; + case BATTERY_STATUS: + if (batstate == 1) // Discharging +- snprintf(buf, n, "remaining %d%%", batcapacity); ++ snprintf(buf, n, "remaining (%d%%)", batcapacity); + else + snprintf(buf, n, batstate == 2 ? "charging (%d%%)" : + (batstate == 7 ? "absent/on AC" : "charged (%d%%)"), +@@ -497,26 +493,10 @@ static int check_bat(const char *bat) -- /* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */ -- if ((cpu_setup == 0) || (!info.cpu_usage)) { -- get_cpu_count(); -- cpu_setup = 1; + int get_battery_perct(const char *bat) + { +- union acpi_battery_ioctl_arg battio; +- int batnum, acpifd; +- int designcap, lastfulcap, batperct; ++ int batcapacity; + +- if ((battio.unit = batnum = check_bat(bat)) < 0) +- return 0; +- if ((acpifd = open("/dev/acpi", O_RDONLY)) < 0) { +- fprintf(stderr, "Can't open ACPI device\n"); +- return 0; +- } +- if (ioctl(acpifd, ACPIIO_BATT_GET_BIF, &battio) == -1) { +- fprintf(stderr, "Unable to get info for battery unit %d\n", batnum); +- return 0; - } -+ get_cpu_count(); +- close(acpifd); +- designcap = battio.bif.dcap; +- lastfulcap = battio.bif.lfcap; +- batperct = (designcap > 0 && lastfulcap > 0) ? +- (int) (((float) lastfulcap / designcap) * 100) : 0; +- return batperct > 100 ? 100 : batperct; ++ get_battery_stats(NULL, &batcapacity, NULL, NULL); ++ return batcapacity; + } - if (!global_cpu) { - malloc_cpu_size = (info.cpu_count + 1) * sizeof(struct cpu_info); -@@ -702,7 +706,7 @@ - free(dev_select); + int get_battery_perct_bar(const char *bar) +@@ -970,11 +950,14 @@ void get_battery_short_status(char *buff + if (0 == strncmp("charging", buffer, 8)) { + buffer[0] = 'C'; + memmove(buffer + 1, buffer + 8, n - 8); +- } else if (0 == strncmp("discharging", buffer, 11)) { ++ } else if (0 == strncmp("remaining", buffer, 9)) { + buffer[0] = 'D'; +- memmove(buffer + 1, buffer + 11, n - 11); ++ memmove(buffer + 1, buffer + 9, n - 9); ++ } else if (0 == strncmp("charged", buffer, 7)) { ++ buffer[0] = 'F'; ++ memmove(buffer + 1, buffer + 7, n - 7); + } else if (0 == strncmp("absent/on AC", buffer, 12)) { +- buffer[0] = 'A'; ++ buffer[0] = 'N'; + memmove(buffer + 1, buffer + 12, n - 12); } - -- free(statinfo_cur.dinfo); -+ free(statinfo_cur.dinfo->mem_ptr); - return 0; } - Modified: branches/2016Q2/sysutils/conky/files/patch-src-freebsd.h ============================================================================== --- branches/2016Q2/sysutils/conky/files/patch-src-freebsd.h Thu Apr 28 16:53:46 2016 (r414184) +++ branches/2016Q2/sysutils/conky/files/patch-src-freebsd.h Thu Apr 28 16:59:27 2016 (r414185) @@ -1,5 +1,5 @@ ---- src/freebsd.h.orig 2012-12-04 04:24:41.000000000 +0200 -+++ src/freebsd.h 2012-12-04 04:24:52.000000000 +0200 +--- src/freebsd.h.orig 2012-05-03 21:08:27 UTC ++++ src/freebsd.h @@ -10,6 +10,7 @@ #include #include Modified: branches/2016Q2/sysutils/conky/files/patch-src-fs.c ============================================================================== --- branches/2016Q2/sysutils/conky/files/patch-src-fs.c Thu Apr 28 16:53:46 2016 (r414184) +++ branches/2016Q2/sysutils/conky/files/patch-src-fs.c Thu Apr 28 16:59:27 2016 (r414185) @@ -1,6 +1,6 @@ ---- src/fs.c.orig 2012-05-04 00:08:27.000000000 +0300 -+++ src/fs.c 2012-07-18 20:24:10.000000000 +0300 -@@ -118,9 +118,15 @@ +--- src/fs.c.orig 2012-05-03 21:08:27 UTC ++++ src/fs.c +@@ -118,9 +118,15 @@ struct fs_stat *prepare_fs_stat(const ch static void update_fs_stat(struct fs_stat *fs) { From owner-svn-ports-branches@freebsd.org Thu Apr 28 21:40:51 2016 Return-Path: Delivered-To: svn-ports-branches@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 2D9D1B2064A; Thu, 28 Apr 2016 21:40:51 +0000 (UTC) (envelope-from matthew@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 B7BA1143E; Thu, 28 Apr 2016 21:40:50 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3SLeoj1093450; Thu, 28 Apr 2016 21:40:50 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3SLent9093446; Thu, 28 Apr 2016 21:40:49 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201604282140.u3SLent9093446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Thu, 28 Apr 2016 21:40:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414241 - in branches/2016Q2/sysutils/logstash: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2016 21:40:51 -0000 Author: matthew Date: Thu Apr 28 21:40:49 2016 New Revision: 414241 URL: https://svnweb.freebsd.org/changeset/ports/414241 Log: MFH: r414237 Security fix and upgrade to 2.3.2 PR: 209129 Submitted by: enrico.m.crisostomo@gmail.com (maintainer) ChangeLog: https://www.elastic.co/blog/logstash-2.3.1-and-2.2.4-released Security: f2d4f879-0d7c-11e6-925f-6805ca0b3d42 Approved by: ports-secteam (feld) Modified: branches/2016Q2/sysutils/logstash/Makefile branches/2016Q2/sysutils/logstash/distinfo branches/2016Q2/sysutils/logstash/files/logstash.in branches/2016Q2/sysutils/logstash/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/sysutils/logstash/Makefile ============================================================================== --- branches/2016Q2/sysutils/logstash/Makefile Thu Apr 28 21:27:09 2016 (r414240) +++ branches/2016Q2/sysutils/logstash/Makefile Thu Apr 28 21:40:49 2016 (r414241) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= logstash -PORTVERSION= 2.1.0 +PORTVERSION= 2.3.2 CATEGORIES= sysutils java MASTER_SITES= http://download.elastic.co/logstash/logstash/ @@ -11,7 +11,7 @@ COMMENT= Tool for managing events and lo LICENSE= APACHE20 -RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash +RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash USES= cpe CPE_VENDOR= elasticsearch Modified: branches/2016Q2/sysutils/logstash/distinfo ============================================================================== --- branches/2016Q2/sysutils/logstash/distinfo Thu Apr 28 21:27:09 2016 (r414240) +++ branches/2016Q2/sysutils/logstash/distinfo Thu Apr 28 21:40:49 2016 (r414241) @@ -1,2 +1,2 @@ -SHA256 (logstash-2.1.0.tar.gz) = 1f132e0fc9fc46ebe836951bb44c5cd1a5f8e3f653bb44bded55300cc6c892dc -SIZE (logstash-2.1.0.tar.gz) = 73512846 +SHA256 (logstash-2.3.2.tar.gz) = b3c9d943fa273c8087386736ef6809df9c5959bab870a6ab4723f58d48dd38c1 +SIZE (logstash-2.3.2.tar.gz) = 74898843 Modified: branches/2016Q2/sysutils/logstash/files/logstash.in ============================================================================== --- branches/2016Q2/sysutils/logstash/files/logstash.in Thu Apr 28 21:27:09 2016 (r414240) +++ branches/2016Q2/sysutils/logstash/files/logstash.in Thu Apr 28 21:40:49 2016 (r414241) @@ -29,7 +29,7 @@ # Log file path. # # logstash_java_home (string): -# Default value: "/usr/local/openjdk6" +# Default value: "/usr/local/openjdk8" # Root directory of the desired Java SDK. # The JAVA_HOME environment variable is set with the contents of this # variable. @@ -40,9 +40,9 @@ # The JAVA_OPTS environment variable is set with the contents of this # variable. # -# logstash_elastic_datadir (string): -# Default value: "/var/db/logstash". -# Data directory of the embedded ElasticSearch instance. +# logstash_opts (string): +# Default value: "" +# Additional command line flags for logstash, eg. "-r" # . /etc/rc.subr @@ -61,7 +61,7 @@ logdir="/var/log" : ${logstash_log_file="${logdir}/${name}.log"} : ${logstash_java_home="%%JAVA_HOME%%"} : ${logstash_java_opts=""} -: ${logstash_elastic_datadir="%%LOGSTASH_DATA_DIR%%"} +: ${logstash_opts=""} piddir=/var/run/${name} pidfile=${piddir}/${name}.pid @@ -75,16 +75,14 @@ procname="${logstash_java_home}/bin/java logstash_chdir=${logstash_home} logstash_log_options="" -logstash_elastic_options="" if checkyesno logstash_log; then logstash_log_options=" --log ${logstash_log_file}" fi -logstash_args="agent -f ${logstash_config} ${logstash_log_options}" -logstash_elastic_options="-Des.path.data=${logstash_elastic_datadir}" +logstash_args="agent -f ${logstash_config} ${logstash_log_options} ${logstash_opts}" -JAVA_OPTS="${logstash_java_opts} ${logstash_elastic_options}" +JAVA_OPTS="${logstash_java_opts}" JAVA_HOME="${logstash_java_home}" export JAVA_OPTS export JAVA_HOME Modified: branches/2016Q2/sysutils/logstash/pkg-plist ============================================================================== --- branches/2016Q2/sysutils/logstash/pkg-plist Thu Apr 28 21:27:09 2016 (r414240) +++ branches/2016Q2/sysutils/logstash/pkg-plist Thu Apr 28 21:40:49 2016 (r414241) @@ -6,6 +6,7 @@ logstash/Gemfile.jruby-1.9.lock logstash/LICENSE logstash/NOTICE.TXT logstash/bin/logstash +logstash/bin/logstash-plugin logstash/bin/logstash.lib.sh logstash/bin/plugin logstash/bin/rspec @@ -1148,609 +1149,611 @@ logstash/vendor/bundle/jruby/1.9/gems/aw logstash/vendor/bundle/jruby/1.9/gems/aws-sdk-v1-1.66.0/lib/aws/support/errors.rb logstash/vendor/bundle/jruby/1.9/gems/aws-sdk-v1-1.66.0/lib/aws/version.rb logstash/vendor/bundle/jruby/1.9/gems/aws-sdk-v1-1.66.0/rails/init.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/CHANGELOG.rdoc -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/Gemfile -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/Gemfile.lock -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/LICENSE.txt -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/README.rdoc -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/Rakefile -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/backports.gemspec -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/default.mspec -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/argf.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/argf/bytes.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/argf/chars.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/argf/each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/argf/each_byte.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/argf/each_char.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/argf/each_line.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/argf/getbyte.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/argf/lines.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/argf/readbyte.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/collect.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/combination.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/cycle.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/delete_if.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/each_index.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/find_index.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/flatten.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/index.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/map.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/permutation.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/pop.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/product.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/reject.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/reverse_each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/rindex.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/select.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/shift.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/array/shuffle.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/binding.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/binding/eval.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/dir.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/dir/each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/dir/foreach.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/count.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/cycle.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/detect.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/drop.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/drop_while.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/each_cons.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/each_slice.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/each_with_index.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/entries.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/find.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/find_all.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/find_index.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/first.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/group_by.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/inject.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/max_by.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/min_by.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/minmax.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/minmax_by.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/none.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/one.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/partition.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/reduce.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/reject.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/reverse_each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/select.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/sort_by.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/take.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/take_while.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerable/to_a.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerator.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerator/each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerator/next.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerator/rewind.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/enumerator/with_index.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/env.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/env/delete_if.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/env/each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/env/each_key.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/env/each_pair.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/env/each_value.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/env/reject.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/env/select.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/fixnum.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/fixnum/div.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/fixnum/fdiv.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/float.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/float/fdiv.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/gc.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/gc/stress.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/hash.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/hash/constructor.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/hash/delete_if.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/hash/each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/hash/each_key.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/hash/each_pair.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/hash/each_value.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/hash/eql.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/hash/hash.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/hash/reject.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/hash/select.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/integer.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/integer/downto.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/integer/even.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/integer/odd.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/integer/ord.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/integer/pred.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/integer/times.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/integer/upto.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/io.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/io/bytes.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/io/chars.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/io/each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/io/each_byte.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/io/each_char.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/io/each_line.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/io/foreach.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/io/getbyte.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/io/lines.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/io/readbyte.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/kernel.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/kernel/__method__.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/kernel/instance_exec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/kernel/tap.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/method.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/method/name.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/module.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/module/class_exec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/module/module_exec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/numeric.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/numeric/step.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/object_space.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/object_space/each_object.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/process.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/process/exec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/range.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/range/each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/range/step.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/regexp.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/regexp/union.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/stdlib.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/stdlib/tmpdir.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/stop_iteration.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/bytes.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/bytesize.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/each_byte.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/each_char.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/each_line.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/end_with.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/lines.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/partition.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/rpartition.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/start_with.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/string/upto.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/struct.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/struct/each.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/struct/each_pair.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/symbol.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.7/symbol/to_proc.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.8.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.8.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/array.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/array/sample.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/array/try_convert.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/dir.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/dir/to_path.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/enumerable.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/enumerable/each_with_index.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/enumerable/each_with_object.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/enumerator.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/enumerator/new.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/enumerator/with_object.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/env.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/env/key.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/atime.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/basename.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/binary.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/blockdev.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/chardev.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/chmod.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/chown.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/ctime.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/delete.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/directory.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/dirname.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/executable.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/executable_real.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/exist.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/exists.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/expand_path.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/extname.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/file.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/ftype.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/grpowned.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/join.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/lchmod.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/lchown.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/link.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/lstat.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/mtime.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/new.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/open.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/owned.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/pipe.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/readable.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/readable_real.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/readlink.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/rename.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/setgid.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/setuid.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/size.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/socket.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/split.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/stat.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/sticky.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/symlink.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/to_path.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/truncate.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/unlink.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/writable.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/writable_real.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/file/zero.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/float.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/float/round.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/hash.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/hash/assoc.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/hash/default_proc.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/hash/key.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/hash/rassoc.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/hash/try_convert.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/integer.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/integer/magnitude.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/integer/round.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/io.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/io/binread.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/io/open.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/io/try_convert.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/io/ungetbyte.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/kernel.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/kernel/__callee__.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/kernel/define_singleton_method.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/kernel/public_method.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/kernel/public_send.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/kernel/require_relative.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/math.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/math/log.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/math/log2.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/numeric.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/numeric/round.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/proc.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/proc/case_compare.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/proc/curry.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/proc/lambda.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/proc/yield.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/range.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/range/cover.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/regexp.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/regexp/try_convert.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/stdlib.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/stdlib/prime.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/string.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/string/ascii_only.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/string/chr.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/string/clear.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/string/codepoints.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/string/each_codepoint.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/string/getbyte.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/string/ord.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/string/setbyte.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/string/try_convert.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/capitalize.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/casecmp.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/comparable.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/comparison.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/downcase.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/element_reference.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/empty.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/length.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/match.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/next.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/size.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/succ.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/swapcase.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.1/symbol/upcase.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/array.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/array/keep_if.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/array/product.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/array/repeated_combination.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/array/repeated_permutation.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/array/rotate.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/array/select.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/array/sort_by.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/array/uniq.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/complex.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/complex/to_r.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/dir.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/dir/home.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/enumerable.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/enumerable/chunk.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/enumerable/collect_concat.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/enumerable/each_entry.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/enumerable/flat_map.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/enumerable/slice_before.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/float.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/float/infinity.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/float/nan.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/hash.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/hash/keep_if.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/hash/select.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/kernel.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/kernel/singleton_class.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/random.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/stdlib.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/stdlib/matrix.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/stdlib/matrix/eigenvalue_decomposition.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/stdlib/matrix/lup_decomposition.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.2/stdlib/set.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.3.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.3/file.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.3/file/null.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.3/io.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.3/io/advise.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.3/io/binwrite.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.3/io/write.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.3/string.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.3/string/byteslice.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.3/string/prepend.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/1.9.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/array.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/array/bsearch.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/enumerable.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/enumerable/lazy.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/enumerator.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/enumerator/lazy.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/env.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/env/to_h.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/hash.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/hash/default_proc.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/hash/to_h.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/nil.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/nil/to_h.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/range.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/range/bsearch.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/range/size.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/stdlib.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/stdlib/abbrev.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/stdlib/fake_stdlib_lib.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/stdlib/ostruct.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/struct.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.0/struct/to_h.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.0.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.0.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.0/array.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.0/array/to_h.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.0/bignum.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.0/bignum/bit_length.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.0/enumerable.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.0/enumerable/to_h.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.0/fixnum.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.0/fixnum/bit_length.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.0/module.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.0/module/include.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/2.1.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/basic_object.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/force/array_map.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/force/enumerable_map.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/force/hash_select.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/force/string_length.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/force/string_size.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/rails.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/rails/array.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/rails/enumerable.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/rails/hash.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/rails/kernel.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/rails/module.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/rails/string.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/random/MT19937.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/random/bits_and_bytes.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/random/implementation.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/random/load.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/std_lib.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/tools.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/tools/alias_method.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/tools/alias_method_chain.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/tools/arguments.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/tools/extreme_object.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/tools/io.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/tools/make_block_optional.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/tools/path.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/tools/require_relative_dir.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/tools/std_lib.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/tools/suppress_verbose_warnings.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/lib/backports/version.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/set_version/1.8.7.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/set_version/1.9.1.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/set_version/1.9.2.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/set_version/1.9.3.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/set_version/2.0.0.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/set_version/2.1.0.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/set_version/setter.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/argf/each_line_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/argf/each_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/argf/lines_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/array/collect_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/array/rotate_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/array/uniq_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/complex/to_r_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/enumerable/each_entry_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/enumerator/next_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/env/to_h_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/file/join_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/file/lchmod_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/file/new_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/file/open_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/file/to_path_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/fixnum/fdiv_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/gc/stress_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/hash/assoc_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/hash/constructor_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/hash/default_proc_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/hash/delete_if_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/hash/each_pair_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/hash/eql_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/hash/hash_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/hash/keep_if_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/hash/rassoc_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/hash/reject_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/hash/select_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/integer/round_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/io/binread_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/io/chars_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/io/each_char_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/io/lines_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/io/open_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/io/ungetbyte_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/io/write_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/kernel/__callee___spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/kernel/__method___spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/kernel/define_singleton_method_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/kernel/public_method_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/kernel/require_relative_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/math/log2_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/math/log_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/module/class_exec_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/module/module_exec_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/numeric/step_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/proc/curry_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/range/step_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/string/getbyte_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/string/partition_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/string/prepend_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/string/rpartition_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/string/setbyte_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/string/upto_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/symbol/capitalize_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/symbol/comparison_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/symbol/downcase_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/symbol/element_reference_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/symbol/empty_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/symbol/match_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/symbol/swapcase_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/symbol/to_proc_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.6/core/symbol/upcase_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/array/keep_if_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/array/rotate_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/array/select_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/array/uniq_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/complex/to_r_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/enumerable/collect_concat_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/enumerable/flat_map_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/env/to_h_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/file/lchmod_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/file/new_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/file/open_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/file/readlink_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/file/to_path_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/hash/assoc_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/hash/default_proc_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/hash/keep_if_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/hash/rassoc_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/hash/select_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/integer/round_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/io/binread_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/io/open_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/io/ungetbyte_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/io/write_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/kernel/__callee___spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/kernel/define_singleton_method_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/kernel/public_method_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/kernel/require_relative_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/math/log2_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/math/log_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/module/include_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/proc/curry_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/proc/yield_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/range/size_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/string/getbyte_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/string/prepend_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/string/setbyte_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/symbol/capitalize_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/symbol/comparison_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/symbol/downcase_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/symbol/element_reference_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/symbol/empty_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/symbol/match_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/symbol/swapcase_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.8.7/core/symbol/upcase_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.9.1/core/array/rotate_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.9.1/core/env/to_h_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.9.1/core/hash/default_proc_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.9.1/core/io/write_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/spec/tags/1.9.2/core/io/write_spec.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/test/README -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/test/_backport_guards_test.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/test/bit_length_test.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/test/lazy_test.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/test/socket_interaction_test.rb -logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.7/test/test_helper.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/BSDL -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/COPYING -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/ChangeLog.rdoc -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/Gemfile -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/INSTALL -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/NEWS.rdoc -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/README.md -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/Rakefile -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/bindata.gemspec -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/examples/NBT.txt -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/examples/gzip.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/examples/ip_address.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/examples/list.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/examples/nbt.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/examples/tcp_ip.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/alignment.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/array.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/base.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/base_primitive.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/bits.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/buffer.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/choice.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/count_bytes_remaining.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/dsl.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/float.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/framework.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/int.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/io.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/lazy.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/name.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/offset.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/params.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/primitive.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/record.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/registry.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/rest.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/sanitize.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/skip.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/string.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/stringz.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/struct.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/trace.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/version.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/virtual.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/lib/bindata/warnings.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/alignment_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/array_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/base_primitive_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/base_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/bits_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/buffer_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/choice_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/common.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/count_bytes_remaining_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/float_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/int_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/io_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/lazy_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/offset_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/params_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/primitive_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/record_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/registry_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/rest_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/skip_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/string_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/stringz_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/struct_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/system_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/virtual_test.rb -logstash/vendor/bundle/jruby/1.9/gems/bindata-2.1.0/test/warnings_test.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/CHANGELOG.rdoc +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/Gemfile +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/Gemfile.lock +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/LICENSE.txt +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/README.rdoc +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/Rakefile +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/backports.gemspec +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/default.mspec +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/argf.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/argf/bytes.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/argf/chars.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/argf/each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/argf/each_byte.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/argf/each_char.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/argf/each_line.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/argf/getbyte.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/argf/lines.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/argf/readbyte.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/collect.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/combination.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/cycle.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/delete_if.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/each_index.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/find_index.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/flatten.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/index.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/map.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/permutation.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/pop.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/product.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/reject.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/reverse_each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/rindex.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/select.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/shift.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/array/shuffle.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/binding.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/binding/eval.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/dir.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/dir/each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/dir/foreach.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/count.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/cycle.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/detect.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/drop.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/drop_while.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/each_cons.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/each_slice.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/each_with_index.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/entries.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/find.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/find_all.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/find_index.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/first.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/group_by.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/inject.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/max_by.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/min_by.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/minmax.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/minmax_by.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/none.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/one.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/partition.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/reduce.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/reject.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/reverse_each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/select.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/sort_by.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/take.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/take_while.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerable/to_a.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerator.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerator/each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerator/next.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerator/rewind.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/enumerator/with_index.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/env.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/env/delete_if.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/env/each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/env/each_key.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/env/each_pair.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/env/each_value.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/env/reject.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/env/select.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/fixnum.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/fixnum/div.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/fixnum/fdiv.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/float.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/float/fdiv.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/gc.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/gc/stress.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/hash.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/hash/constructor.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/hash/delete_if.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/hash/each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/hash/each_key.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/hash/each_pair.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/hash/each_value.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/hash/eql.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/hash/hash.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/hash/reject.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/hash/select.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/integer.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/integer/downto.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/integer/even.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/integer/odd.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/integer/ord.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/integer/pred.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/integer/times.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/integer/upto.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/io.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/io/bytes.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/io/chars.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/io/each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/io/each_byte.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/io/each_char.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/io/each_line.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/io/foreach.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/io/getbyte.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/io/lines.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/io/readbyte.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/kernel.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/kernel/__method__.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/kernel/instance_exec.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/kernel/tap.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/method.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/method/name.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/module.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/module/class_exec.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/module/module_exec.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/numeric.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/numeric/step.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/object_space.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/object_space/each_object.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/process.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/process/exec.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/range.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/range/each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/range/step.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/regexp.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/regexp/union.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/stdlib.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/stdlib/tmpdir.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/stop_iteration.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/bytes.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/bytesize.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/each_byte.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/each_char.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/each_line.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/end_with.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/lines.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/partition.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/rpartition.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/start_with.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/string/upto.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/struct.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/struct/each.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/struct/each_pair.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/symbol.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.7/symbol/to_proc.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.8.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.8.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/array.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/array/sample.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/array/try_convert.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/dir.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/dir/to_path.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/enumerable.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/enumerable/each_with_index.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/enumerable/each_with_object.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/enumerator.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/enumerator/new.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/enumerator/with_object.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/env.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/env/key.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/atime.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/basename.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/binary.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/blockdev.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/chardev.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/chmod.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/chown.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/ctime.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/delete.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/directory.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/dirname.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/executable.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/executable_real.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/exist.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/exists.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/expand_path.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/extname.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/file.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/ftype.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/grpowned.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/join.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/lchmod.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/lchown.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/link.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/lstat.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/mtime.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/new.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/open.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/owned.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/pipe.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/readable.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/readable_real.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/readlink.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/rename.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/setgid.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/setuid.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/size.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/socket.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/split.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/stat.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/sticky.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/symlink.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/to_path.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/truncate.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/unlink.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/writable.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/writable_real.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/file/zero.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/float.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/float/round.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/hash.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/hash/assoc.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/hash/default_proc.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/hash/key.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/hash/rassoc.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/hash/try_convert.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/integer.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/integer/magnitude.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/integer/round.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/io.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/io/binread.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/io/open.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/io/try_convert.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/io/ungetbyte.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/kernel.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/kernel/__callee__.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/kernel/define_singleton_method.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/kernel/public_method.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/kernel/public_send.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/kernel/require_relative.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/math.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/math/log.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/math/log2.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/numeric.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/numeric/round.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/proc.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/proc/case_compare.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/proc/curry.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/proc/lambda.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/proc/yield.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/range.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/range/cover.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/regexp.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/regexp/try_convert.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/stdlib.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/stdlib/prime.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/string.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/string/ascii_only.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/string/chr.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/string/clear.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/string/codepoints.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/string/each_codepoint.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/string/getbyte.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/string/ord.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/string/setbyte.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/string/try_convert.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/capitalize.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/casecmp.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/comparable.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/comparison.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/downcase.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/element_reference.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/empty.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/length.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/match.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/next.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/size.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/succ.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/swapcase.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.1/symbol/upcase.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.2.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.2/array.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.2/array/keep_if.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.2/array/product.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.2/array/repeated_combination.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.2/array/repeated_permutation.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.2/array/rotate.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.2/array/select.rb +logstash/vendor/bundle/jruby/1.9/gems/backports-3.6.8/lib/backports/1.9.2/array/sort_by.rb *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Fri Apr 29 00:23:48 2016 Return-Path: Delivered-To: svn-ports-branches@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 E24C5B130F2; Fri, 29 Apr 2016 00:23:48 +0000 (UTC) (envelope-from junovitch@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 B31861F66; Fri, 29 Apr 2016 00:23:48 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3T0Nlbj041995; Fri, 29 Apr 2016 00:23:47 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3T0NlGQ041994; Fri, 29 Apr 2016 00:23:47 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604290023.u3T0NlGQ041994@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 29 Apr 2016 00:23:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414244 - branches/2016Q2/sysutils/logstash X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 00:23:49 -0000 Author: junovitch Date: Fri Apr 29 00:23:47 2016 New Revision: 414244 URL: https://svnweb.freebsd.org/changeset/ports/414244 Log: MFH: r414242 Remove ${PORTSDIR}/ from depends. Again. Sponsored by: Absolight Approved by: ports-secteam (with hat) Modified: branches/2016Q2/sysutils/logstash/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/sysutils/logstash/Makefile ============================================================================== --- branches/2016Q2/sysutils/logstash/Makefile Thu Apr 28 22:30:14 2016 (r414243) +++ branches/2016Q2/sysutils/logstash/Makefile Fri Apr 29 00:23:47 2016 (r414244) @@ -11,7 +11,7 @@ COMMENT= Tool for managing events and lo LICENSE= APACHE20 -RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash +RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash USES= cpe CPE_VENDOR= elasticsearch From owner-svn-ports-branches@freebsd.org Fri Apr 29 00:26:24 2016 Return-Path: Delivered-To: svn-ports-branches@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 763A0B131D8; Fri, 29 Apr 2016 00:26:24 +0000 (UTC) (envelope-from junovitch@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 4E26B1068; Fri, 29 Apr 2016 00:26:24 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3T0QNhV042320; Fri, 29 Apr 2016 00:26:23 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3T0QMRx042314; Fri, 29 Apr 2016 00:26:22 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604290026.u3T0QMRx042314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 29 Apr 2016 00:26:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414245 - in branches/2016Q2/devel: subversion subversion/files subversion18 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 00:26:24 -0000 Author: junovitch Date: Fri Apr 29 00:26:22 2016 New Revision: 414245 URL: https://svnweb.freebsd.org/changeset/ports/414245 Log: MFH: r414181 Update: devel/subversion to 1.9.4 devel/subversion18 to 1.8.16 This fix two CVEs: http://subversion.apache.org/security/CVE-2016-2167-advisory.txt http://subversion.apache.org/security/CVE-2016-2168-advisory.txt Security: CVE-2016-2167 Security: CVE-2016-2168 Security: https://vuxml.FreeBSD.org/freebsd/c8174b63-0d3a-11e6-b06e-d43d7eed0ce2.html Approved by: ports-secteam (with hat) Deleted: branches/2016Q2/devel/subversion/files/patch-configure Modified: branches/2016Q2/devel/subversion/Makefile branches/2016Q2/devel/subversion/Makefile.common branches/2016Q2/devel/subversion/distinfo branches/2016Q2/devel/subversion18/Makefile branches/2016Q2/devel/subversion18/Makefile.common branches/2016Q2/devel/subversion18/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/subversion/Makefile ============================================================================== --- branches/2016Q2/devel/subversion/Makefile Fri Apr 29 00:23:47 2016 (r414244) +++ branches/2016Q2/devel/subversion/Makefile Fri Apr 29 00:26:22 2016 (r414245) @@ -1,7 +1,7 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ -PORTREVISION= 3 +#PORTREVISION= 0 MAINTAINER= lev@FreeBSD.org COMMENT= Version control system Modified: branches/2016Q2/devel/subversion/Makefile.common ============================================================================== --- branches/2016Q2/devel/subversion/Makefile.common Fri Apr 29 00:23:47 2016 (r414244) +++ branches/2016Q2/devel/subversion/Makefile.common Fri Apr 29 00:26:22 2016 (r414245) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= subversion -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.4 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= APACHE/subversion Modified: branches/2016Q2/devel/subversion/distinfo ============================================================================== --- branches/2016Q2/devel/subversion/distinfo Fri Apr 29 00:23:47 2016 (r414244) +++ branches/2016Q2/devel/subversion/distinfo Fri Apr 29 00:26:22 2016 (r414245) @@ -1,2 +1,2 @@ -SHA256 (subversion19/subversion-1.9.3.tar.bz2) = 8bbf6bb125003d88ee1c22935a36b7b1ab7d957e0c8b5fbfe5cb6310b6e86ae0 -SIZE (subversion19/subversion-1.9.3.tar.bz2) = 7909193 +SHA256 (subversion19/subversion-1.9.4.tar.bz2) = 1267f9e2ab983f260623bee841e6c9cc458bf4bf776238ed5f100983f79e9299 +SIZE (subversion19/subversion-1.9.4.tar.bz2) = 7911473 Modified: branches/2016Q2/devel/subversion18/Makefile ============================================================================== --- branches/2016Q2/devel/subversion18/Makefile Fri Apr 29 00:23:47 2016 (r414244) +++ branches/2016Q2/devel/subversion18/Makefile Fri Apr 29 00:26:22 2016 (r414245) @@ -1,7 +1,7 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ -PORTREVISION= 4 +#PORTREVISION= 4 MAINTAINER= lev@FreeBSD.org COMMENT= Version control system Modified: branches/2016Q2/devel/subversion18/Makefile.common ============================================================================== --- branches/2016Q2/devel/subversion18/Makefile.common Fri Apr 29 00:23:47 2016 (r414244) +++ branches/2016Q2/devel/subversion18/Makefile.common Fri Apr 29 00:26:22 2016 (r414245) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= subversion -PORTVERSION= 1.8.15 +PORTVERSION= 1.8.16 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= APACHE/subversion Modified: branches/2016Q2/devel/subversion18/distinfo ============================================================================== --- branches/2016Q2/devel/subversion18/distinfo Fri Apr 29 00:23:47 2016 (r414244) +++ branches/2016Q2/devel/subversion18/distinfo Fri Apr 29 00:26:22 2016 (r414245) @@ -1,2 +1,2 @@ -SHA256 (subversion18/subversion-1.8.15.tar.bz2) = cf98a1f7686cfd6a15cbcde8379f15730fd5e00a3573cdb035a6491dbcccc82c -SIZE (subversion18/subversion-1.8.15.tar.bz2) = 6917489 +SHA256 (subversion18/subversion-1.8.16.tar.bz2) = f18f6e8309270982135aae54d96958f9ca6b93f8a4e746dd634b1b5b84edb346 +SIZE (subversion18/subversion-1.8.16.tar.bz2) = 6919310 From owner-svn-ports-branches@freebsd.org Fri Apr 29 05:34:59 2016 Return-Path: Delivered-To: svn-ports-branches@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 0166AB202B1; Fri, 29 Apr 2016 05:34:58 +0000 (UTC) (envelope-from rm@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 9EA1617B5; Fri, 29 Apr 2016 05:34:58 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3T5YvKJ037301; Fri, 29 Apr 2016 05:34:57 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3T5YvFU037299; Fri, 29 Apr 2016 05:34:57 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201604290534.u3T5YvFU037299@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Fri, 29 Apr 2016 05:34:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414256 - branches/2016Q2/www/py-html5lib X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 05:34:59 -0000 Author: rm Date: Fri Apr 29 05:34:57 2016 New Revision: 414256 URL: https://svnweb.freebsd.org/changeset/ports/414256 Log: MFH: r413602 www/py-html5lib: drop TEST option Distfile with test data disappeared (along with the web-server), so drop the TEST option. It seems there are official tests at https://github.com/html5lib/html5lib-tests, so it should be switched to them someday. PR: 208903 Reported by: marino Approved by: ports-secteam (blanket) Modified: branches/2016Q2/www/py-html5lib/Makefile branches/2016Q2/www/py-html5lib/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/py-html5lib/Makefile ============================================================================== --- branches/2016Q2/www/py-html5lib/Makefile Fri Apr 29 04:55:00 2016 (r414255) +++ branches/2016Q2/www/py-html5lib/Makefile Fri Apr 29 05:34:57 2016 (r414256) @@ -4,8 +4,7 @@ PORTNAME= html5lib PORTVERSION= 0.9999999 CATEGORIES= www python -MASTER_SITES= CHEESESHOP \ - http://magemana.nl/ports/dist/:test +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= rm@FreeBSD.org @@ -15,28 +14,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose - -OPTIONS_DEFINE= TEST NO_ARCH= yes USES= python USE_PYTHON= autoplist distutils -.include - -.if !empty(PORT_OPTIONS:MTEST) -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${PORTNAME}-0.999-testdata${EXTRACT_SUFX}:test -BUILD_DEPENDS+= ${TEST_DEPENDS} -.endif - -regression-test: build - @${ECHO_MSG} "===> Testing ${PORTNAME} (patience...)" - @cd ${WRKSRC} && nosetests -q - -.if !empty(PORT_OPTIONS:MTEST) -pre-install: regression-test -.endif - .include Modified: branches/2016Q2/www/py-html5lib/distinfo ============================================================================== --- branches/2016Q2/www/py-html5lib/distinfo Fri Apr 29 04:55:00 2016 (r414255) +++ branches/2016Q2/www/py-html5lib/distinfo Fri Apr 29 05:34:57 2016 (r414256) @@ -1,4 +1,2 @@ SHA256 (html5lib-0.9999999.tar.gz) = 2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868 SIZE (html5lib-0.9999999.tar.gz) = 889312 -SHA256 (html5lib-0.999-testdata.tar.gz) = 27c6b2d9668aecf893a34a25ce19af324d5d8ba3acd734ea2915321a3d03a9cd -SIZE (html5lib-0.999-testdata.tar.gz) = 788956 From owner-svn-ports-branches@freebsd.org Fri Apr 29 13:29:21 2016 Return-Path: Delivered-To: svn-ports-branches@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 2E556B2183F; Fri, 29 Apr 2016 13:29:21 +0000 (UTC) (envelope-from lme@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 F3F0F145A; Fri, 29 Apr 2016 13:29:20 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3TDTKgI080141; Fri, 29 Apr 2016 13:29:20 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3TDTKVE080139; Fri, 29 Apr 2016 13:29:20 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604291329.u3TDTKVE080139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Fri, 29 Apr 2016 13:29:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414271 - branches/2016Q2/net-mgmt/icingaweb2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 13:29:21 -0000 Author: lme Date: Fri Apr 29 13:29:19 2016 New Revision: 414271 URL: https://svnweb.freebsd.org/changeset/ports/414271 Log: MFH: r414184 Update to 2.3.2 Changelog: https://www.icinga.org/2016/04/28/icinga-web-2-v2-3-2-v2-2-0-and-v2-1-3-hotfix-releases/ Approved by: ports-secteam (feld) Modified: branches/2016Q2/net-mgmt/icingaweb2/Makefile branches/2016Q2/net-mgmt/icingaweb2/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net-mgmt/icingaweb2/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/icingaweb2/Makefile Fri Apr 29 12:47:20 2016 (r414270) +++ branches/2016Q2/net-mgmt/icingaweb2/Makefile Fri Apr 29 13:29:19 2016 (r414271) @@ -2,6 +2,7 @@ PORTNAME= icingaweb2 DISTVERSIONPREFIX= v +DISTVERSION= 2.3.2 DISTVERSION= 2.2.0 CATEGORIES= net-mgmt www Modified: branches/2016Q2/net-mgmt/icingaweb2/distinfo ============================================================================== --- branches/2016Q2/net-mgmt/icingaweb2/distinfo Fri Apr 29 12:47:20 2016 (r414270) +++ branches/2016Q2/net-mgmt/icingaweb2/distinfo Fri Apr 29 13:29:19 2016 (r414271) @@ -1,2 +1,2 @@ -SHA256 (icinga-icingaweb2-v2.2.0_GH0.tar.gz) = f240b35a4082b4835127608d0b11a27a4bf53bb0c88857344255225ce9611201 -SIZE (icinga-icingaweb2-v2.2.0_GH0.tar.gz) = 9803668 +SHA256 (icinga-icingaweb2-v2.3.2_GH0.tar.gz) = 89abfec58726cadc0380897880190ece84f74f34152b1146ee7b24244337b76d +SIZE (icinga-icingaweb2-v2.3.2_GH0.tar.gz) = 9812433 From owner-svn-ports-branches@freebsd.org Fri Apr 29 16:34:21 2016 Return-Path: Delivered-To: svn-ports-branches@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 ECD03B2133C; Fri, 29 Apr 2016 16:34:21 +0000 (UTC) (envelope-from robak@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 BD49316D0; Fri, 29 Apr 2016 16:34:21 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3TGYKb9039351; Fri, 29 Apr 2016 16:34:20 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3TGYKRH039350; Fri, 29 Apr 2016 16:34:20 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201604291634.u3TGYKRH039350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Fri, 29 Apr 2016 16:34:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414283 - branches/2016Q2/net/freeswitch X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 16:34:22 -0000 Author: robak Date: Fri Apr 29 16:34:20 2016 New Revision: 414283 URL: https://svnweb.freebsd.org/changeset/ports/414283 Log: MFH: r414243 net/freeswitch: fix port build error PR: 209115 Submitted by: Corey Smith (maintainer) Approved by: portmgr (blanket) Modified: branches/2016Q2/net/freeswitch/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net/freeswitch/Makefile ============================================================================== --- branches/2016Q2/net/freeswitch/Makefile Fri Apr 29 15:49:21 2016 (r414282) +++ branches/2016Q2/net/freeswitch/Makefile Fri Apr 29 16:34:20 2016 (r414283) @@ -3,6 +3,7 @@ PORTNAME= freeswitch PORTVERSION= 1.6.6 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} @@ -118,7 +119,7 @@ DISTFILES+= ${EXTRADISTFILES} post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/sounds .for distfile in ${EXTRADISTFILES} - ${TAR} --cd ${STAGEDIR}${DATADIR}/sounds -xf ${DISTDIR}/${distfile} + ${TAR} --cd ${STAGEDIR}${DATADIR}/sounds -xf ${DISTDIR}/${distfile:S/:sounds$//} .endfor ${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} ${RM} -r ${STAGEDIR}${ETCDIR} From owner-svn-ports-branches@freebsd.org Fri Apr 29 16:36:29 2016 Return-Path: Delivered-To: svn-ports-branches@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 4D421B21394; Fri, 29 Apr 2016 16:36:29 +0000 (UTC) (envelope-from robak@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 03FB817E1; Fri, 29 Apr 2016 16:36:28 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3TGaSf5039593; Fri, 29 Apr 2016 16:36:28 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3TGaSZd039592; Fri, 29 Apr 2016 16:36:28 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201604291636.u3TGaSZd039592@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Fri, 29 Apr 2016 16:36:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414284 - branches/2016Q2/net/freeswitch X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 16:36:29 -0000 Author: robak Date: Fri Apr 29 16:36:27 2016 New Revision: 414284 URL: https://svnweb.freebsd.org/changeset/ports/414284 Log: MFH: r413022 r414243 Fix build as a user. Before this, it was downloading the sound distfiles in ${DISTDIR}/../sounds. Sponsored by: Absolight net/freeswitch: fix port build error PR: 209115 Submitted by: Corey Smith (maintainer) Approved by: portmgr (blanket) Modified: branches/2016Q2/net/freeswitch/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net/freeswitch/Makefile ============================================================================== --- branches/2016Q2/net/freeswitch/Makefile Fri Apr 29 16:34:20 2016 (r414283) +++ branches/2016Q2/net/freeswitch/Makefile Fri Apr 29 16:36:27 2016 (r414284) @@ -5,7 +5,8 @@ PORTNAME= freeswitch PORTVERSION= 1.6.6 PORTREVISION= 1 CATEGORIES= net -MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ +MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ \ + http://files.freeswitch.org/releases/sounds/:sounds DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= corsmith@gmail.com @@ -102,15 +103,15 @@ BITRATES+= 48000 .endif .for rate in ${BITRATES} -EXTRADISTFILES+= ../sounds/${EDPRE}-music-${rate}-${EDPOST} +EXTRADISTFILES+= ${EDPRE}-music-${rate}-${EDPOST}:sounds .if ${PORT_OPTIONS:MENGLISH} -EXTRADISTFILES+= ../sounds/${EDPRE}-en-us-callie-${rate}-${EDPOST} +EXTRADISTFILES+= ${EDPRE}-en-us-callie-${rate}-${EDPOST}:sounds .endif .if ${PORT_OPTIONS:MFRENCH} -EXTRADISTFILES+= ../sounds/${EDPRE}-fr-ca-june-${rate}-${EDPOST} +EXTRADISTFILES+= ${EDPRE}-fr-ca-june-${rate}-${EDPOST}:sounds .endif .if ${PORT_OPTIONS:MRUSSIAN} -EXTRADISTFILES+= ../sounds/${EDPRE}-ru-RU-elena-${rate}-${EDPOST} +EXTRADISTFILES+= ${EDPRE}-ru-RU-elena-${rate}-${EDPOST}:sounds .endif .endfor From owner-svn-ports-branches@freebsd.org Fri Apr 29 18:48:32 2016 Return-Path: Delivered-To: svn-ports-branches@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 CF7C8B21030; Fri, 29 Apr 2016 18:48:32 +0000 (UTC) (envelope-from jhb@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 AABF413AE; Fri, 29 Apr 2016 18:48:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3TImVLE079227; Fri, 29 Apr 2016 18:48:31 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3TImVaE079225; Fri, 29 Apr 2016 18:48:31 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201604291848.u3TImVaE079225@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 29 Apr 2016 18:48:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414287 - in branches/2016Q2/devel/gdb: . files/kgdb X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 18:48:32 -0000 Author: jhb (src,doc committer) Date: Fri Apr 29 18:48:31 2016 New Revision: 414287 URL: https://svnweb.freebsd.org/changeset/ports/414287 Log: MFH: r414115 Fix an issue with gdb triggering assertions in kgdb on i386. The kgdb targets use runtime assertions on native targets to verify that the helper arrays documenting the layout of things like the PCB and trapframe structures match. Ideally these asserts would be compile time assertions, but they cannot be checked at compile time. Instead, they are checked at runtime during gdb startup. However, the layout of the i386 PCB changed when the AVX changes were merged to i386. The constants in the i386 target assume the post-AVX layout, but gdb packages on stable branches might be built against pre-AVX worlds. In that case, those gdb binaries will trigger these assertions on every invocation. As a workaround, disable the PCB-related assertions on pre-AVX worlds. If kgdb is run against a pre-AVX kernel it will not be able to parse the PCB correctly, but userland debugging should work fine. kgdb built against a pre-AVX world but run against an AVX kernel should work fine. PR: 209061 Reported by: trasz Approved by: ports-secteam (junovitch) Modified: branches/2016Q2/devel/gdb/Makefile branches/2016Q2/devel/gdb/files/kgdb/i386fbsd-kern.c Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/gdb/Makefile ============================================================================== --- branches/2016Q2/devel/gdb/Makefile Fri Apr 29 18:24:11 2016 (r414286) +++ branches/2016Q2/devel/gdb/Makefile Fri Apr 29 18:48:31 2016 (r414287) @@ -3,7 +3,7 @@ PORTNAME= gdb PORTVERSION= 7.11 -#PORTREVISION= +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNU Modified: branches/2016Q2/devel/gdb/files/kgdb/i386fbsd-kern.c ============================================================================== --- branches/2016Q2/devel/gdb/files/kgdb/i386fbsd-kern.c Fri Apr 29 18:24:11 2016 (r414286) +++ branches/2016Q2/devel/gdb/files/kgdb/i386fbsd-kern.c Fri Apr 29 18:48:31 2016 (r414287) @@ -478,6 +478,20 @@ _initialize_i386_kgdb_tdep(void) i386fbsd_pspace_data_cleanup); #ifdef __i386__ + /* + * FreeBSD/i386 kernels prior to the introduction of AVX + * support used a different layout for the PCB. If gdb is + * compiled on these systems, these asserts will fail. The + * package builders build packages on older systems which are + * then run on newer systems. These binaries trip over these + * assertions even when debugging user programs and even + * though the running kernel is new enough. To cope, disable + * the assertion checks unless gdb is built against a new + * enough world. Note that this means kgdb is not going to + * parse PCBs correctly on FreeBSD/i386 kernels before AVX was + * merged. + */ +#if __FreeBSD_version >= 1001505 gdb_assert(offsetof(struct pcb, pcb_ebx) == i386fbsd_pcb_offset[I386_EBX_REGNUM]); gdb_assert(offsetof(struct pcb, pcb_esp) @@ -490,6 +504,7 @@ _initialize_i386_kgdb_tdep(void) == i386fbsd_pcb_offset[I386_EDI_REGNUM]); gdb_assert(offsetof(struct pcb, pcb_eip) == i386fbsd_pcb_offset[I386_EIP_REGNUM]); +#endif gdb_assert(CODE_SEL == GSEL(GCODE_SEL, SEL_KPL)); gdb_assert(DATA_SEL == GSEL(GDATA_SEL, SEL_KPL)); gdb_assert(PRIV_SEL == GSEL(GPRIV_SEL, SEL_KPL));