Attachment 184843 Details for Bug 220871 – rslsync patch

[patch] rslsync patch

patch.diff (text/plain), 11.56 KB, created by joshruehlig on 2017-07-30 07:56:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joshruehlig

Created: 2017-07-30 07:56:17 UTC

Size: 11.56 KB

patch

obsolete

>Index: GIDs
>===================================================================
>--- GIDs	(revision 446905)
>+++ GIDs	(working copy)
>@@ -758,7 +758,7 @@
> puppet:*:814:
> uchiwa:*:815:
> # free: 816
>-btsync:*:817:
>+rslsync:*:817:
> jenkins:*:818:
> rundeck:*:819:
> openacs:*:820:
>Index: MOVED
>===================================================================
>--- MOVED	(revision 446905)
>+++ MOVED	(working copy)
>@@ -9471,3 +9471,4 @@
> audio/gstreamer1-plugins-mad|audio/gstreamer1-plugins-mpg123|2017-07-21|The GStreamer 1 mad plugin was removed, the mpg123 plugin supplies the same functionality
> x11-toolkits/gstreamer1-plugins-gtksink|x11-toolkits/gstreamer1-plugins-gtk|2017-07-21|The GStreamer 1 gtksink plugin was renamed
> devel/ffcall|devel/libffcall|2017-07-28|Project was renamed
>+net-p2p/btsync|net-p2p/rslsync|2017-07-20|Renamed by the vendor
>Index: UIDs
>===================================================================
>--- UIDs	(revision 446905)
>+++ UIDs	(working copy)
>@@ -763,7 +763,7 @@
> 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 446905)
>+++ 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 446905)
>+++ net-p2p/btsync/Makefile	(working copy)
>@@ -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>
>Index: net-p2p/btsync/distinfo
>===================================================================
>--- net-p2p/btsync/distinfo	(revision 446905)
>+++ net-p2p/btsync/distinfo	(working copy)
>@@ -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
>Index: net-p2p/btsync/files/pkg-message.in
>===================================================================
>--- net-p2p/btsync/files/pkg-message.in	(revision 446905)
>+++ net-p2p/btsync/files/pkg-message.in	(working copy)
>@@ -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/
>-
>-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
>Index: net-p2p/btsync/pkg-descr
>===================================================================
>--- net-p2p/btsync/pkg-descr	(revision 446905)
>+++ net-p2p/btsync/pkg-descr	(working copy)
>@@ -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
>Index: net-p2p/btsync/pkg-plist
>===================================================================
>--- net-p2p/btsync/pkg-plist	(revision 446905)
>+++ net-p2p/btsync/pkg-plist	(working copy)
>@@ -1,3 +0,0 @@
>-bin/btsync
>-@sample etc/%%PORTNAME%%.conf.sample
>-@dir(%%USER%%,%%GROUP%%,) /var/db/%%PORTNAME%%
>Index: net-p2p/rslsync/Makefile
>===================================================================
>--- net-p2p/rslsync/Makefile	(nonexistent)
>+++ net-p2p/rslsync/Makefile	(working copy)
>@@ -0,0 +1,49 @@
>+# $FreeBSD$
>+
>+PORTNAME=	rslsync
>+PORTVERSION=	2.5.6
>+CATEGORIES=	net-p2p
>+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=	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.
>+
>+PLIST_SUB=	USER=${USERS} GROUP=${GROUPS}
>+SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
>+SUB_FILES=	pkg-message
>+USE_RC_SUBR=	rslsync
>+
>+USERS=		rslsync
>+GROUPS=		${USERS}
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == "amd64"
>+CONFIG_ARCH=	x64
>+.else
>+CONFIG_ARCH=	${ARCH}
>+.endif
>+
>+do-build:
>+	${WRKSRC}/rslsync --dump-sample-config > ${WRKSRC}/rslsync.conf.sample
>+	${REINPLACE_CMD} -e 's;^//$[[:space:]]*"storage_path"[[:space:]]*:[[:space:]]*$"/.*",$$;\1"/var/db/rslsync",;' ${WRKSRC}/rslsync.conf.sample
>+	${REINPLACE_CMD} -e 's;^//$[[:space:]]*"pid_file"[[:space:]]*:[[:space:]]*$"/.*",$$;\1"/var/run/rslsync/rslsync.pid",;' ${WRKSRC}/rslsync.conf.sample
>+
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/rslsync ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_DATA} ${WRKSRC}/rslsync.conf.sample ${STAGEDIR}${PREFIX}/etc
>+	${MKDIR} ${STAGEDIR}/var/db/rslsync
>+
>+.include <bsd.port.post.mk>
>Index: net-p2p/rslsync/Makefile.orig
>===================================================================
>Index: net-p2p/rslsync/distinfo
>===================================================================
>--- net-p2p/rslsync/distinfo	(nonexistent)
>+++ net-p2p/rslsync/distinfo	(working copy)
>@@ -0,0 +1,5 @@
>+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/distinfo.orig
>===================================================================
>Index: net-p2p/rslsync/files/pkg-message.in
>===================================================================
>--- net-p2p/rslsync/files/pkg-message.in	(nonexistent)
>+++ net-p2p/rslsync/files/pkg-message.in	(working copy)
>@@ -0,0 +1,15 @@
>+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
>+
>+net-p2p/rslsync includes an RC script:
>+%%PREFIX%%/etc/rc.d/rslsync
>+
>+TO START ON BOOT:
>+# sysrc rslsync_enable=YES
>+
>+START MANUALLY:
>+# service rslsync start
>+
>+Once started, visit the following to configure:
>+http://localhost:8888/
>+
>+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
>Index: net-p2p/rslsync/files/pkg-message.in.orig
>===================================================================
>Index: net-p2p/rslsync/files/rslsync.in
>===================================================================
>--- net-p2p/rslsync/files/rslsync.in	(nonexistent)
>+++ net-p2p/rslsync/files/rslsync.in	(working copy)
>@@ -0,0 +1,43 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+# PROVIDE: rslsync
>+# REQUIRE: LOGIN
>+# KEYWORD: shutdown
>+#
>+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
>+# to enable this service:
>+#
>+# rslsync_enable (bool):        Set to NO by default.
>+#                               Set it to YES to enable it.
>+# rslsync_user:        	        The user account rslsync 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.
>+# rslsync_group:                The group account rslsync 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="rslsync"
>+rcvar="${name}_enable"
>+load_rc_config ${name}
>+
>+: ${rslsync_enable:="NO"}
>+: ${rslsync_user:="%%USER%%"}
>+: ${rslsync_group:="%%GROUP%%"}
>+
>+pidfile="/var/run/rslsync/rslsync.pid"
>+command="%%PREFIX%%/bin/rslsync"
>+command_args="--config %%PREFIX%%/etc/rslsync.conf"
>+
>+start_precmd=rslsync_prestart
>+rslsync_prestart() {
>+	if [ ! -d ${pidfile%/*} ]; then
>+		install -d -o ${rslsync_user} -g ${rslsync_group} ${pidfile%/*}
>+	fi
>+}
>+
>+run_rc_command "$1"
>Index: net-p2p/rslsync/files/rslsync.in.orig
>===================================================================
>Index: net-p2p/rslsync/pkg-descr
>===================================================================
>--- net-p2p/rslsync/pkg-descr	(nonexistent)
>+++ net-p2p/rslsync/pkg-descr	(working copy)
>@@ -0,0 +1,6 @@
>+Resilio 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: https://www.resilio.com/
>Index: net-p2p/rslsync/pkg-descr.orig
>===================================================================
>Index: net-p2p/rslsync/pkg-plist
>===================================================================
>--- net-p2p/rslsync/pkg-plist	(nonexistent)
>+++ net-p2p/rslsync/pkg-plist	(working copy)
>@@ -0,0 +1,3 @@
>+bin/rslsync
>+@sample etc/rslsync.conf.sample
>+@dir(%%USER%%,%%GROUP%%,) /var/db/rslsync
>Index: net-p2p/rslsync/pkg-plist.orig
>===================================================================

Flags:

joshruehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 220871: 184524 | 184558 | 184843