svn commit: r530237 - in head/sysutils: burp burp-devel burp/files

[Lorenzo Salvadore]

Author: salvadore
Date: Wed Apr  1 20:05:55 2020
New Revision: 530237
URL: https://svnweb.freebsd.org/changeset/ports/530237

Log:
  sysutils/burp-devel: Update to 2.3.24
  
  - Protocol 2: warn and skip on verify/restore of unsupported file types.
  - Resurrect, improve and use sysutils/burp/files/burp.in instead of the rc
  script from distfile, both for sysutils/burp (master port) and for
  sysutils/burp-devel (slave port): this is necessary because, while
  sysutils/burp's distfile still distributes the script, sysutils/burp-devel's
  distfile does not anymore starting with version 2.3.24. I also made a few
  modifications to the file so that it behaves well with non standard PREFIX
  values.
  
  Reviewed by:	0mp, gerald, dbaio, adamw
  Approved by:	tcberner (co-mentor)
  Differential Revision:	https://reviews.freebsd.org/D24104

Added:
  head/sysutils/burp/files/
     - copied from r503688, head/sysutils/burp/files/
Modified:
  head/sysutils/burp-devel/Makefile
  head/sysutils/burp-devel/distinfo
  head/sysutils/burp/Makefile
  head/sysutils/burp/files/burp.in
  head/sysutils/burp/pkg-plist

Modified: head/sysutils/burp-devel/Makefile
==============================================================================
--- head/sysutils/burp-devel/Makefile	Wed Apr  1 19:59:45 2020	(r530236)
+++ head/sysutils/burp-devel/Makefile	Wed Apr  1 20:05:55 2020	(r530237)
@@ -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
 

Modified: head/sysutils/burp-devel/distinfo
==============================================================================
--- head/sysutils/burp-devel/distinfo	Wed Apr  1 19:59:45 2020	(r530236)
+++ head/sysutils/burp-devel/distinfo	Wed Apr  1 20:05:55 2020	(r530237)
@@ -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

Modified: head/sysutils/burp/Makefile
==============================================================================
--- head/sysutils/burp/Makefile	Wed Apr  1 19:59:45 2020	(r530236)
+++ head/sysutils/burp/Makefile	Wed Apr  1 20:05:55 2020	(r530237)
@@ -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 at FreeBSD.org
@@ -20,8 +21,8 @@ LIB_DEPENDS=	librsync.so:net/librsync2
 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 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION}
 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>

Modified: head/sysutils/burp/files/burp.in
==============================================================================
--- head/sysutils/burp/files/burp.in	Sat Jun  8 00:51:35 2019	(r503688)
+++ head/sysutils/burp/files/burp.in	Wed Apr  1 20:05:55 2020	(r530237)
@@ -14,7 +14,7 @@
 #
 #
 
-export PATH="$PATH:/usr/local/bin:/usr/local/sbin"
+export PATH="$PATH:%%PREFIX%%/bin:%%PREFIX%%/sbin"
 
 . /etc/rc.subr
 
@@ -31,7 +31,7 @@ load_rc_config $name
 
 burp_flags="-c ${burp_config}"
 
-command="/usr/local/sbin/${name}"
+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

Modified: head/sysutils/burp/pkg-plist
==============================================================================
--- head/sysutils/burp/pkg-plist	Wed Apr  1 19:59:45 2020	(r530236)
+++ head/sysutils/burp/pkg-plist	Wed Apr  1 20:05:55 2020	(r530237)
@@ -1,10 +1,9 @@
 bin/vss_strip
-%%ETCDIR%%/CA.cnf
-%%ETCDIR%%/burp-server.conf
-%%ETCDIR%%/burp.conf
+ at sample %%ETCDIR%%/CA.cnf.sample
+ at sample %%ETCDIR%%/burp-server.conf.sample
+ at sample %%ETCDIR%%/burp.conf.sample
 %%ETCDIR%%/clientconfdir/incexc/example
-%%ETCDIR%%/clientconfdir/testclient
-etc/rc.d/burp
+ at sample %%ETCDIR%%/clientconfdir/testclient.sample
 man/man8/bedup.8.gz
 man/man8/bsigs.8.gz
 man/man8/bsparse.8.gz