svn commit: r415055 - in head/sysutils/burp: . files

[Bartek Rutkowski]

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 <loic-freebsd at loicp.eu> (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 at 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 "$@"