From owner-svn-ports-all@freebsd.org Mon May 4 19:21:56 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 94F9B2C0400; Mon, 4 May 2020 19:21:56 +0000 (UTC) (envelope-from salvadore@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49GCQr2lJdz4fpM; Mon, 4 May 2020 19:21:56 +0000 (UTC) (envelope-from salvadore@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 598231353; Mon, 4 May 2020 19:21:56 +0000 (UTC) (envelope-from salvadore@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 044JLurJ017816; Mon, 4 May 2020 19:21:56 GMT (envelope-from salvadore@FreeBSD.org) Received: (from salvadore@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 044JLtpR017812; Mon, 4 May 2020 19:21:55 GMT (envelope-from salvadore@FreeBSD.org) Message-Id: <202005041921.044JLtpR017812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: salvadore set sender to salvadore@FreeBSD.org using -f From: Lorenzo Salvadore Date: Mon, 4 May 2020 19:21:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533970 - in branches/2020Q2/sysutils: burp burp-devel burp/files X-SVN-Group: ports-branches X-SVN-Commit-Author: salvadore X-SVN-Commit-Paths: in branches/2020Q2/sysutils: burp burp-devel burp/files X-SVN-Commit-Revision: 533970 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2020 19:21:56 -0000 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@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@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 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 +@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