From owner-svn-ports-head@freebsd.org Thu May 12 09:25:16 2016 Return-Path: Delivered-To: svn-ports-head@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 2DF86B37A80; Thu, 12 May 2016 09:25:16 +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 E243A1F33; Thu, 12 May 2016 09:25:15 +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 u4C9PFfJ041797; Thu, 12 May 2016 09:25:15 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4C9PEwT041795; Thu, 12 May 2016 09:25:14 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201605120925.u4C9PEwT041795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Thu, 12 May 2016 09:25:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415055 - in head/sysutils/burp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 May 2016 09:25:16 -0000 Author: robak Date: Thu May 12 09:25:14 2016 New Revision: 415055 URL: https://svnweb.freebsd.org/changeset/ports/415055 Log: sysutils/burp: add port options and update rc script - Add IPv6 port option - Replace rc script with upstream one PR: 208861 Submitted by: Loic Pefferkorn (maintainer) Modified: head/sysutils/burp/Makefile head/sysutils/burp/files/burp.in Modified: head/sysutils/burp/Makefile ============================================================================== --- head/sysutils/burp/Makefile Thu May 12 09:16:32 2016 (r415054) +++ head/sysutils/burp/Makefile Thu May 12 09:25:14 2016 (r415055) @@ -3,6 +3,7 @@ PORTNAME= burp PORTVERSION= 1.4.40 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= loic-freebsd@loicp.eu @@ -14,6 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/uthash.h:devel/uthash LIB_DEPENDS= librsync.so:net/librsync1 +OPTIONS_DEFINE= IPV6 +OPTIONS_DEFAULT= IPV6 + USE_GITHUB= yes GH_ACCOUNT= grke @@ -26,6 +30,8 @@ PORTSCOUT= limit:^1\.4\. CONFIGURE_ARGS= --sbindir="${PREFIX}/sbin" \ --sysconfdir=${ETCDIR} \ +IPV6_CONFIGURE_ENABLE= ipv6 + CONFIG_FILES= configs/server/burp.conf \ configs/client/burp.conf \ configs/certs/CA/CA.cnf Modified: head/sysutils/burp/files/burp.in ============================================================================== --- head/sysutils/burp/files/burp.in Thu May 12 09:16:32 2016 (r415054) +++ head/sysutils/burp/files/burp.in Thu May 12 09:25:14 2016 (r415055) @@ -1,32 +1,57 @@ #!/bin/sh -# $FreeBSD$ -# +# Burp rc.d script, placed in the public domain by Jarkko Kniivilä @ 2014-05-14 + # PROVIDE: burp -# REQUIRE: LOGIN +# REQUIRE: DAEMON # KEYWORD: shutdown # -# Add these lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: +# Add the following lines to /etc/rc.conf to enable Burp: +# +# burp_enable="YES" +# # optional +# burp_config="%%PREFIX%%/etc/burp/burp-server.conf" # -# burp_enable (bool): Set to NO by default. -# Set it to YES to enable burp. -# burp_config (path): Set to %%PREFIX%%/etc/burp/burp.cf -# by default. +# + +export PATH="$PATH:/usr/local/bin:/usr/local/sbin" . /etc/rc.subr name=burp rcvar=burp_enable +monitor_cmd="${name}_monitor" +summary_cmd="${name}_summary" load_rc_config $name +# Set some defaults : ${burp_enable:="NO"} -: ${burp_config="%%PREFIX%%/etc/burp/burp-server.conf"} +: ${burp_config:="%%PREFIX%%/etc/burp/burp-server.conf"} + +burp_flags="-c ${burp_config}" -command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.server.pid +command="/usr/local/sbin/${name}" +command_args="> /dev/null 2>&1" -command_args="-c $burp_config" +pidfile="/var/run/${name}.server.pid" # this really depends on the config file so make sure they concur +required_files="${burp_config}" +sig_reload="HUP" +extra_commands="reload monitor summary" + +burp_monitor() +{ + rc_flags="-a s ${rc_flags}" + ${command} ${rc_flags} +} + +burp_summary() +{ + # This allows you to get the output of the '-a S' flag thusly: + # service burp summary -C $my_client + + rc_flags="-a S ${rc_flags}" + ${command} ${rc_flags} "$@" +} -run_rc_command "$1" +run_rc_command "$@"