Attachment 184524 Details for Bug 220871 – The Patch

[patch] The Patch

rslsync.patch (text/plain), 12.78 KB, created by Akinori MUSHA on 2017-07-20 01:05:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Akinori MUSHA

Created: 2017-07-20 01:05:56 UTC

Size: 12.78 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 446237)
>+++ MOVED	(working copy)
>@@ -9466,3 +9466,4 @@ dns/opendnssec13|dns/opendnssec14|2017-0
> multimedia/banshee||2017-07-13|Has expired: Project is not being actively maintained upstream anymore
> www/libhtp-suricata||2017-07-16|No longer required. security/suricata now uses official (not forked) libhtp 
> databases/py-odbc|databases/py-pyodbc|2017-07-18|Rename to comply with PyPI scheme
>+net-p2p/btsync|net-p2p/rslsync|2017-07-20|Renamed by the vendor
>Index: GIDs
>===================================================================
>--- GIDs	(revision 446237)
>+++ GIDs	(working copy)
>@@ -758,7 +758,7 @@ foreman_proxy:*:812:
> puppet:*:814:
> uchiwa:*:815:
> # free: 816
>-btsync:*:817:
>+rslsync:*:817:
> jenkins:*:818:
> rundeck:*:819:
> openacs:*:820:
>Index: UIDs
>===================================================================
>--- UIDs	(revision 446237)
>+++ UIDs	(working copy)
>@@ -763,7 +763,7 @@ foreman_proxy:*:812:812::0:0:Foreman Sma
> puppet:*:814:814::0:0:Puppet Daemon:/nonexistent:/usr/sbin/nologin
> uchiwa:*:815:815::0:0:Uchiwa Dashboard:/nonexistent:/usr/sbin/nologin
> # free: 816
>-btsync:*:817:817::0:0:BitTorrent Sync Daemon:/nonexistent:/usr/sbin/nologin
>+rslsync:*:817:817::0:0:Resilio Sync Daemon:/nonexistent:/usr/sbin/nologin
> jenkins:*:818:818::0:0:Jenkins CI:/usr/local/jenkins:/bin/sh
> rundeck:*:819:819::0:0:Rundeck:/usr/local/rundeck:/bin/sh
> openacs:*:820:820::0:0:OpenACS Daemon User:/nonexistent:/usr/sbin/nologin
>Index: net-p2p/Makefile
>===================================================================
>--- net-p2p/Makefile	(revision 446237)
>+++ net-p2p/Makefile	(working copy)
>@@ -12,7 +12,6 @@
>     SUBDIR += bitmessage
>     SUBDIR += bnbt
>     SUBDIR += btpd
>-    SUBDIR += btsync
>     SUBDIR += couchpotato
>     SUBDIR += cpuminer
>     SUBDIR += createtorrent
>@@ -76,6 +75,7 @@
>     SUBDIR += qbittorrent-nox11
>     SUBDIR += radarr
>     SUBDIR += retroshare
>+    SUBDIR += rslsync
>     SUBDIR += rtorrent
>     SUBDIR += shx
>     SUBDIR += sonarr
>Index: net-p2p/btsync/Makefile
>===================================================================
>--- net-p2p/btsync/Makefile	(revision 446237)
>+++ net-p2p/btsync/Makefile	(nonexistent)
>@@ -1,51 +0,0 @@
>-# $FreeBSD$
>-
>-PORTNAME=	btsync
>-PORTVERSION=	2.3.8
>-CATEGORIES=	net-p2p
>-MASTER_SITES=	https://download-cdn.getsync.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/ \
>-		http://download-cdn.getsync.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/
>-DISTNAME=	BitTorrent-Sync_freebsd_${CONFIG_ARCH}
>-
>-MAINTAINER=	joshruehlig@gmail.com
>-COMMENT=	Distributed peer-to-peer file syncing application
>-
>-LICENSE=	EULA
>-LICENSE_NAME=	BitTorrent Sync
>-LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
>-LICENSE_PERMS=	auto-accept
>-
>-NO_WRKSUBDIR=	yes
>-NO_BUILD=	yes
>-ONLY_FOR_ARCHS=	amd64 i386
>-ONLY_FOR_ARCHS_REASON=	It is a binary-only program. Source code not available.
>-
>-PLIST_SUB=	PORTNAME=${PORTNAME} USER=${USERS} GROUP=${GROUPS}
>-SUB_LIST=	PORTNAME=${PORTNAME} USER=${USERS} GROUP=${GROUPS}
>-SUB_FILES=	pkg-message
>-USE_RC_SUBR=	${PORTNAME}
>-
>-USERS=		${PORTNAME}
>-GROUPS=		${USERS}
>-
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == "amd64"
>-CONFIG_ARCH=	x64
>-.else
>-CONFIG_ARCH=	${ARCH}
>-.endif
>-
>-post-extract:
>-	${MKDIR} ${WRKSRC}/temp
>-	${MV} ${WRKSRC}/${PORTNAME} ${WRKSRC}/temp
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/temp/btsync ${STAGEDIR}${PREFIX}/bin
>-	${WRKSRC}/temp/btsync --dump-sample-config > ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
>-	${REINPLACE_CMD} -e 's;^//$[[:space:]]*"storage_path"[[:space:]]*:[[:space:]]*$"/.*",$$;\1"/var/db/${PORTNAME}",;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
>-	${REINPLACE_CMD} -e 's;^//$[[:space:]]*"pid_file"[[:space:]]*:[[:space:]]*"/var/run/${PORTNAME}/${PORTNAME}.pid",$$$;\1;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
>-
>-	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
>-
>-.include <bsd.port.post.mk>
>
>Property changes on: net-p2p/btsync/Makefile
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-p2p/btsync/distinfo
>===================================================================
>--- net-p2p/btsync/distinfo	(revision 446237)
>+++ net-p2p/btsync/distinfo	(nonexistent)
>@@ -1,5 +0,0 @@
>-TIMESTAMP = 1466844210
>-SHA256 (BitTorrent-Sync_freebsd_i386.tar.gz) = 103ba012acd4af2365243f10f2fa8a2bdc551b47ac326b00a71624a0289c73fc
>-SIZE (BitTorrent-Sync_freebsd_i386.tar.gz) = 5714805
>-SHA256 (BitTorrent-Sync_freebsd_x64.tar.gz) = fa0312f6616eb29ac9daa4b436ffda3dda3790d03f57008271963c63006060f6
>-SIZE (BitTorrent-Sync_freebsd_x64.tar.gz) = 5879165
>
>Property changes on: net-p2p/btsync/distinfo
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-p2p/btsync/files/btsync.in
>===================================================================
>--- net-p2p/btsync/files/btsync.in	(revision 446237)
>+++ net-p2p/btsync/files/btsync.in	(nonexistent)
>@@ -1,43 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD$
>-#
>-# PROVIDE: %%PORTNAME%%
>-# REQUIRE: LOGIN
>-# KEYWORD: shutdown
>-#
>-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
>-# to enable this service:
>-#
>-# %%PORTNAME%%_enable (bool):   Set to NO by default.
>-#                               Set it to YES to enable it.
>-# %%PORTNAME%%_user:            The user account %%PORTNAME%% daemon runs as
>-#                               what you want it to be. It uses '%%USER%%'
>-#                               user by default. Do not sets it as empty or it
>-#                               will run as root.
>-# %%PORTNAME%%_group:           The group account %%PORTNAME%% daemon runs as
>-#                               what you want it to be. It uses '%%GROUP%%'
>-#                               group by default. Do not sets it as empty or it
>-#                               will run as wheel.
>-
>-. /etc/rc.subr
>-name="%%PORTNAME%%"
>-rcvar="${name}_enable"
>-load_rc_config $name
>-
>-: ${%%PORTNAME%%_enable:="NO"}
>-: ${%%PORTNAME%%_user:="%%USER%%"}
>-: ${%%PORTNAME%%_group:="%%GROUP%%"}
>-
>-pidfile="/var/run/%%PORTNAME%%/%%PORTNAME%%.pid"
>-command="%%PREFIX%%/bin/btsync"
>-command_args="--config %%PREFIX%%/etc/%%PORTNAME%%.conf"
>-
>-start_precmd=%%PORTNAME%%_prestart
>-%%PORTNAME%%_prestart() {
>-	if [ ! -d ${pidfile%/*} ]; then
>-		install -d -o $%%PORTNAME%%_user -g $%%PORTNAME%%_group ${pidfile%/*}
>-	fi
>-}
>-
>-run_rc_command "$1"
>
>Property changes on: net-p2p/btsync/files/btsync.in
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-p2p/btsync/files/pkg-message.in
>===================================================================
>--- net-p2p/btsync/files/pkg-message.in	(revision 446237)
>+++ net-p2p/btsync/files/pkg-message.in	(nonexistent)
>@@ -1,15 +0,0 @@
>-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
>-
>-net-p2p/%%PORTNAME%% includes an RC script:
>-%%PREFIX%%/etc/rc.d/%%PORTNAME%%
>-
>-TO START ON BOOT:
>-# echo '%%PORTNAME%%_enable="YES"' >> /etc/rc.conf
>-
>-START MANUALLY:
>-# service %%PORTNAME%% start
>-
>-Once started, visit the following to configure:
>-http://localhost:8888/
>-
>-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
>
>Property changes on: net-p2p/btsync/files/pkg-message.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-p2p/btsync/pkg-descr
>===================================================================
>--- net-p2p/btsync/pkg-descr	(revision 446237)
>+++ net-p2p/btsync/pkg-descr	(nonexistent)
>@@ -1,6 +0,0 @@
>-Bittorrent Sync is a way to automatically sync files via a secure,
>-distributed technology. This allows users to share, sync and copy
>-data between computers and, optionally, share subsets of their data
>-with other people.
>-
>-WWW: http://www.bittorrent.com/sync
>
>Property changes on: net-p2p/btsync/pkg-descr
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-p2p/btsync/pkg-plist
>===================================================================
>--- net-p2p/btsync/pkg-plist	(revision 446237)
>+++ net-p2p/btsync/pkg-plist	(nonexistent)
>@@ -1,3 +0,0 @@
>-bin/btsync
>-@sample etc/%%PORTNAME%%.conf.sample
>-@dir(%%USER%%,%%GROUP%%,) /var/db/%%PORTNAME%%
>
>Property changes on: net-p2p/btsync/pkg-plist
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-p2p/rslsync/Makefile
>===================================================================
>--- net-p2p/rslsync/Makefile	(revision 446237)
>+++ net-p2p/rslsync/Makefile	(working copy)
>@@ -1,17 +1,18 @@
> # $FreeBSD$
> 
>-PORTNAME=	btsync
>-PORTVERSION=	2.3.8
>+PORTNAME=	rslsync
>+PORTVERSION=	2.5.6
> CATEGORIES=	net-p2p
>-MASTER_SITES=	https://download-cdn.getsync.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/ \
>-		http://download-cdn.getsync.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/
>-DISTNAME=	BitTorrent-Sync_freebsd_${CONFIG_ARCH}
>+MASTER_SITES=	https://download-cdn.resilio.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/ \
>+		http://download-cdn.resilio.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/
>+DISTNAME=	resilio-sync_freebsd_${CONFIG_ARCH}
>+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	joshruehlig@gmail.com
> COMMENT=	Distributed peer-to-peer file syncing application
> 
> LICENSE=	EULA
>-LICENSE_NAME=	BitTorrent Sync
>+LICENSE_NAME=	Resilio Sync
> LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
> LICENSE_PERMS=	auto-accept
> 
>@@ -41,8 +42,8 @@ post-extract:
> 	${MV} ${WRKSRC}/${PORTNAME} ${WRKSRC}/temp
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/temp/btsync ${STAGEDIR}${PREFIX}/bin
>-	${WRKSRC}/temp/btsync --dump-sample-config > ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
>+	${INSTALL_PROGRAM} ${WRKSRC}/temp/rslsync ${STAGEDIR}${PREFIX}/bin
>+	${WRKSRC}/temp/rslsync --dump-sample-config > ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
> 	${REINPLACE_CMD} -e 's;^//$[[:space:]]*"storage_path"[[:space:]]*:[[:space:]]*$"/.*",$$;\1"/var/db/${PORTNAME}",;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
> 	${REINPLACE_CMD} -e 's;^//$[[:space:]]*"pid_file"[[:space:]]*:[[:space:]]*"/var/run/${PORTNAME}/${PORTNAME}.pid",$$$;\1;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
> 
>Index: net-p2p/rslsync/distinfo
>===================================================================
>--- net-p2p/rslsync/distinfo	(revision 446237)
>+++ net-p2p/rslsync/distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1466844210
>-SHA256 (BitTorrent-Sync_freebsd_i386.tar.gz) = 103ba012acd4af2365243f10f2fa8a2bdc551b47ac326b00a71624a0289c73fc
>-SIZE (BitTorrent-Sync_freebsd_i386.tar.gz) = 5714805
>-SHA256 (BitTorrent-Sync_freebsd_x64.tar.gz) = fa0312f6616eb29ac9daa4b436ffda3dda3790d03f57008271963c63006060f6
>-SIZE (BitTorrent-Sync_freebsd_x64.tar.gz) = 5879165
>+TIMESTAMP = 1500511377
>+SHA256 (rslsync-2.5.6/resilio-sync_freebsd_i386.tar.gz) = d9e945b020bcaecb81d84150e2b860b3035e55937ad9b0e7943fb071dbfb9f5b
>+SIZE (rslsync-2.5.6/resilio-sync_freebsd_i386.tar.gz) = 10956405
>+SHA256 (rslsync-2.5.6/resilio-sync_freebsd_x64.tar.gz) = 89bee505743075ba2ce45653e1e71bfae9bacbeefbc3fd6d06a7d722a44000c6
>+SIZE (rslsync-2.5.6/resilio-sync_freebsd_x64.tar.gz) = 11133558
>Index: net-p2p/rslsync/files/pkg-message.in
>===================================================================
>Index: net-p2p/rslsync/files/rslsync.in
>===================================================================
>Index: net-p2p/rslsync/pkg-descr
>===================================================================
>Index: net-p2p/rslsync/pkg-plist
>===================================================================
>--- net-p2p/rslsync/pkg-plist	(revision 446237)
>+++ net-p2p/rslsync/pkg-plist	(working copy)
>@@ -1,3 +1,3 @@
>-bin/btsync
>+bin/rslsync
> @sample etc/%%PORTNAME%%.conf.sample
> @dir(%%USER%%,%%GROUP%%,) /var/db/%%PORTNAME%%

Actions: View | Diff

Attachments on bug 220871: 184524 | 184558 | 184843