svn commit: r536292 - head/net-p2p/rslsync

[Jochen Neumeister]

Author: joneum
Date: Sat May 23 12:18:02 2020
New Revision: 536292
URL: https://svnweb.freebsd.org/changeset/ports/536292

Log:
  Update to 2.6.4
  
  Changelog:
  - Fixed security issue in the Sync WebUI. Credits to Frantisek Uhrecky (fruh)
  
  PR:		243518
  Reported by:	Volodymyr Kostyrko <arcade at b1t.name> (maintainer)
  MFH:		2020Q2
  Sponsored by:	Netzkommune GmbH

Modified:
  head/net-p2p/rslsync/Makefile
  head/net-p2p/rslsync/distinfo

Modified: head/net-p2p/rslsync/Makefile
==============================================================================
--- head/net-p2p/rslsync/Makefile	Sat May 23 11:40:31 2020	(r536291)
+++ head/net-p2p/rslsync/Makefile	Sat May 23 12:18:02 2020	(r536292)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rslsync
-PORTVERSION=	2.6.3
+PORTVERSION=	2.6.4
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://download-cdn.resilio.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/ \
 		http://download-cdn.resilio.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/
@@ -16,10 +16,13 @@ LICENSE_NAME=	Resilio Sync
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 LICENSE_PERMS=	auto-accept
 
-NO_WRKSUBDIR=	yes
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	It is a binary-only program. Source code not available.
 
+CONFLICTS_INSTALL=	rslsync-beta
+
+NO_WRKSUBDIR=	yes
+
 PLIST_SUB=	USER=${USERS} GROUP=${GROUPS}
 SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
 SUB_FILES=	pkg-message
@@ -47,6 +50,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}/var/db/rslsync
 
 maintainer-makesum:
-	for arch in ${ONLY_FOR_ARCHS}; do ${MAKE} DISTINFO_FILE=/dev/stdout ARCH=$$arch makesum; done | awk '$$1 != "TIMESTAMP" || NR == 1' > ${DISTINFO_FILE}
+	for arch in ${ONLY_FOR_ARCHS}; do ${MAKE} DISTINFO_FILE=/dev/stdout ARCH=$$arch makesum; done | ${AWK} '$$1 != "TIMESTAMP" || NR == 1' > ${DISTINFO_FILE}
 
 .include <bsd.port.post.mk>

Modified: head/net-p2p/rslsync/distinfo
==============================================================================
--- head/net-p2p/rslsync/distinfo	Sat May 23 11:40:31 2020	(r536291)
+++ head/net-p2p/rslsync/distinfo	Sat May 23 12:18:02 2020	(r536292)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1539858959
-SHA256 (rslsync-2.6.3/resilio-sync_freebsd_x64.tar.gz) = 4a52324773d4409ea45532135cfe8e698669248f503e74ec62ed821589d54faf
-SIZE (rslsync-2.6.3/resilio-sync_freebsd_x64.tar.gz) = 13097739
-SHA256 (rslsync-2.6.3/resilio-sync_freebsd_i386.tar.gz) = f92120496c816008227eb4f41340fcff75a08e1de282c4e6be1c5debf4465947
-SIZE (rslsync-2.6.3/resilio-sync_freebsd_i386.tar.gz) = 13023322
+TIMESTAMP = 1579475384
+SHA256 (rslsync-2.6.4/resilio-sync_freebsd_x64.tar.gz) = 2c4b1118104c2f0900cabf4c0ef1dd2912a462fab2b63dfd7618eb1a935a636b
+SIZE (rslsync-2.6.4/resilio-sync_freebsd_x64.tar.gz) = 13097078
+SHA256 (rslsync-2.6.4/resilio-sync_freebsd_i386.tar.gz) = a4721c51c4001bcaae2f48c00f9093e6dea12b65576cf701801570d1b1d82609
+SIZE (rslsync-2.6.4/resilio-sync_freebsd_i386.tar.gz) = 13023092