svn commit: r533970 - in branches/2020Q2/sysutils: burp burp-devel burp/files
Lorenzo Salvadore
salvadore at FreeBSD.org
Mon May 4 19:21:56 UTC 2020
Author: salvadore
Date: Mon May 4 19:21:55 2020
New Revision: 533970
URL: https://svnweb.freebsd.org/changeset/ports/533970
Log:
MFH: r530237
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.
- Fix bug #246062.
Reviewed by: 0mp, gerald, dbaio, adamw
Approved by: tcberner (co-mentor)
Differential Revision: https://reviews.freebsd.org/D24104
PR: 246062
Reported by: tictactux at gmail.com
Approved by: ports-secteam (joneum), gerald (mentor)
Added:
branches/2020Q2/sysutils/burp/files/
- copied from r530237, head/sysutils/burp/files/
Modified:
branches/2020Q2/sysutils/burp-devel/Makefile
branches/2020Q2/sysutils/burp-devel/distinfo
branches/2020Q2/sysutils/burp/Makefile
branches/2020Q2/sysutils/burp/pkg-plist
Directory Properties:
branches/2020Q2/ (props changed)
Modified: branches/2020Q2/sysutils/burp-devel/Makefile
==============================================================================
--- branches/2020Q2/sysutils/burp-devel/Makefile Mon May 4 19:20:48 2020 (r533969)
+++ branches/2020Q2/sysutils/burp-devel/Makefile Mon May 4 19:21:55 2020 (r533970)
@@ -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: branches/2020Q2/sysutils/burp-devel/distinfo
==============================================================================
--- branches/2020Q2/sysutils/burp-devel/distinfo Mon May 4 19:20:48 2020 (r533969)
+++ branches/2020Q2/sysutils/burp-devel/distinfo Mon May 4 19:21:55 2020 (r533970)
@@ -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: branches/2020Q2/sysutils/burp/Makefile
==============================================================================
--- branches/2020Q2/sysutils/burp/Makefile Mon May 4 19:20:48 2020 (r533969)
+++ branches/2020Q2/sysutils/burp/Makefile Mon May 4 19:21:55 2020 (r533970)
@@ -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: branches/2020Q2/sysutils/burp/pkg-plist
==============================================================================
--- branches/2020Q2/sysutils/burp/pkg-plist Mon May 4 19:20:48 2020 (r533969)
+++ branches/2020Q2/sysutils/burp/pkg-plist Mon May 4 19:21:55 2020 (r533970)
@@ -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
More information about the svn-ports-all
mailing list