Page MenuHomeFreeBSD

D24104.diff
No OneTemporary

D24104.diff

Index: head/sysutils/burp-devel/Makefile
===================================================================
--- head/sysutils/burp-devel/Makefile
+++ head/sysutils/burp-devel/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTVERSION= 2.3.22
+PORTVERSION= 2.3.24
PORTREVISION= 0 #this is a slave port that needs PORTREVISION to be tracked separately
PKGNAMESUFFIX= -devel
Index: head/sysutils/burp-devel/distinfo
===================================================================
--- head/sysutils/burp-devel/distinfo
+++ head/sysutils/burp-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580671041
-SHA256 (grke-burp-2.3.22_GH0.tar.gz) = e8f1c3c2432916bfec631e452c09ef48b13ec77fe715300638e474b6e49d455b
-SIZE (grke-burp-2.3.22_GH0.tar.gz) = 628380
+TIMESTAMP = 1583262411
+SHA256 (grke-burp-2.3.24_GH0.tar.gz) = 0d95e8e46bad01164c31cbb0ac173a2d668ef4e56530b19c8e0801ab13f0924b
+SIZE (grke-burp-2.3.24_GH0.tar.gz) = 615113
Index: head/sysutils/burp/Makefile
===================================================================
--- head/sysutils/burp/Makefile
+++ head/sysutils/burp/Makefile
@@ -3,8 +3,9 @@
PORTNAME= burp
PORTVERSION?= 2.2.18
-PORTREVISION?= 2 #whenever PORTREVISION is increased, it must be increased for
- #the slave port sysutils/burp-devel too
+# whenever PORTREVISION is increased,
+# sysutils/burp-devel's PKGVERSION must also increase
+PORTREVISION?= 3
CATEGORIES= sysutils
MAINTAINER= salvadore@FreeBSD.org
@@ -20,8 +21,8 @@
RUN_DEPENDS= bash:shells/bash
USES= autoreconf gmake libtool ncurses pkgconfig ssl
+USE_RC_SUBR= burp
USE_GITHUB= yes
-
GH_ACCOUNT= grke
GNU_CONFIGURE= yes
@@ -37,10 +38,15 @@
OPTIONS_DEFINE= IPV6
IPV6_CONFIGURE_ENABLE= ipv6
-post-patch:
- ${REINPLACE_CMD} "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/freebsd/rc.d/burp
+CONFIG_FILES= CA.cnf \
+ burp-server.conf \
+ burp.conf \
+ clientconfdir/testclient
post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/freebsd/rc.d/burp ${STAGEDIR}${PREFIX}/etc/rc.d/burp
+.for FILE in ${CONFIG_FILES}
+ ${MV} ${STAGEDIR}${ETCDIR}/${FILE} \
+ ${STAGEDIR}${ETCDIR}/${FILE}.sample
+.endfor
.include <bsd.port.mk>
Index: head/sysutils/burp/files/burp.in
===================================================================
--- head/sysutils/burp/files/burp.in
+++ head/sysutils/burp/files/burp.in
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# Burp rc.d script, placed in the public domain by Jarkko Kniivilä @ 2014-05-14
+
+# PROVIDE: burp
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable Burp:
+#
+# burp_enable="YES"
+# # optional
+# burp_config="%%PREFIX%%/etc/burp/burp-server.conf"
+#
+#
+
+export PATH="$PATH:%%PREFIX%%/bin:%%PREFIX%%/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_flags="-c ${burp_config}"
+
+command="%%PREFIX%%/sbin/${name}"
+command_args="> /dev/null 2>&1"
+
+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 "$@"
Index: head/sysutils/burp/pkg-plist
===================================================================
--- head/sysutils/burp/pkg-plist
+++ head/sysutils/burp/pkg-plist
@@ -1,10 +1,9 @@
bin/vss_strip
-%%ETCDIR%%/CA.cnf
-%%ETCDIR%%/burp-server.conf
-%%ETCDIR%%/burp.conf
+@sample %%ETCDIR%%/CA.cnf.sample
+@sample %%ETCDIR%%/burp-server.conf.sample
+@sample %%ETCDIR%%/burp.conf.sample
%%ETCDIR%%/clientconfdir/incexc/example
-%%ETCDIR%%/clientconfdir/testclient
-etc/rc.d/burp
+@sample %%ETCDIR%%/clientconfdir/testclient.sample
man/man8/bedup.8.gz
man/man8/bsigs.8.gz
man/man8/bsparse.8.gz

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 28, 3:34 AM (18 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26273242
Default Alt Text
D24104.diff (4 KB)

Event Timeline