Attachment 159442 Details for Bug 202027 – Patch sysutils/linux-crashplan to 4.3.0

Patch sysutils/linux-crashplan to 4.3.0

crashplan-4.3.0.diff (text/plain), 5.29 KB, created by Nuno Subtil on 2015-08-01 16:57:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Subtil

Created: 2015-08-01 16:57:35 UTC

Size: 5.29 KB

patch

obsolete

>commit ef27ede0389601aaf02626c243c58b892e8a4c28
>Author: Nuno Subtil <subtil@gmail.com>
>Date:   Mon May 18 20:23:09 2015 -0700
>
>    Update crashplan to 4.3.0
>
>diff --git a/sysutils/linux-crashplan/Makefile b/sysutils/linux-crashplan/Makefile
>index e3e5533..fbfcccc 100644
>--- a/sysutils/linux-crashplan/Makefile
>+++ b/sysutils/linux-crashplan/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	linux-crashplan
>-DISTVERSION=	3.7.0
>+DISTVERSION=	4.3.0
> CATEGORIES=	sysutils linux
> MASTER_SITES=	http://download.crashplan.com/installs/linux/install/CrashPlan/
> DISTNAME=	CrashPlan_${DISTVERSION}_Linux
>diff --git a/sysutils/linux-crashplan/distinfo b/sysutils/linux-crashplan/distinfo
>index feee84b..8965271 100644
>--- a/sysutils/linux-crashplan/distinfo
>+++ b/sysutils/linux-crashplan/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (CrashPlan_3.7.0_Linux.tgz) = 596cbbd2d852229a726c44caeae5ef79b7c0fc8e092286c867b401669eb19c16
>-SIZE (CrashPlan_3.7.0_Linux.tgz) = 22110542
>+SHA256 (CrashPlan_4.3.0_Linux.tgz) = 4fbb23ccd47db8aef7029c923520a22a7dfe6e5585d27ff29ef395752934b0d3
>+SIZE (CrashPlan_4.3.0_Linux.tgz) = 26368468
>diff --git a/sysutils/linux-crashplan/files/patch-CrashPlanDesktop b/sysutils/linux-crashplan/files/patch-CrashPlanDesktop
>index 4f26523..5fb1028 100644
>--- a/sysutils/linux-crashplan/files/patch-CrashPlanDesktop
>+++ b/sysutils/linux-crashplan/files/patch-CrashPlanDesktop
>@@ -1,8 +1,8 @@
>---- scripts/CrashPlanDesktop.orig	2013-09-23 11:40:09.770062319 -0300
>-+++ scripts/CrashPlanDesktop	2013-09-23 12:08:29.635060972 -0300
>-@@ -4,9 +4,11 @@
>- SCRIPTDIR=$(dirname $SCRIPT)
>+--- scripts/CrashPlanDesktop
>++++ scripts/CrashPlanDesktop
>+@@ -5,9 +5,11 @@ SCRIPTDIR=$(dirname $SCRIPT)
>  TARGETDIR="$SCRIPTDIR/.."
>+ export SWT_GTK3=0
>  
> -. ${TARGETDIR}/install.vars
> -. ${TARGETDIR}/bin/run.conf
>@@ -12,6 +12,6 @@
>  
> -${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
> +. bin/run.conf
>-+: ${LOGDIR=/var/log/crashplan}
>++${LOGDIR=/var/log/crashplan}
> +
> +${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${LOGDIR}/ui_output.log 2> ${LOGDIR}/ui_error.log &
>diff --git a/sysutils/linux-crashplan/files/patch-CrashPlanEngine b/sysutils/linux-crashplan/files/patch-CrashPlanEngine
>index 783698e..2281c37 100644
>--- a/sysutils/linux-crashplan/files/patch-CrashPlanEngine
>+++ b/sysutils/linux-crashplan/files/patch-CrashPlanEngine
>@@ -1,6 +1,6 @@
>---- scripts/CrashPlanEngine.orig	2013-04-08 20:36:04.000000000 -0300
>-+++ scripts/CrashPlanEngine	2013-09-23 10:54:57.806062403 -0300
>-@@ -11,7 +11,7 @@
>+--- scripts/CrashPlanEngine
>++++ scripts/CrashPlanEngine
>+@@ -11,7 +11,7 @@ standard_startup() {
>  	
>  	cd $TARGETDIR
>  		
>@@ -9,7 +9,7 @@
>  	
>  	if [[ $! -gt 0 ]]; then
>  		echo $! > $PIDFILE
>-@@ -80,7 +80,7 @@
>+@@ -80,7 +80,7 @@ do_startup() {
>  }
>  
>  _findpid() {
>@@ -18,13 +18,3 @@
>  }
>  
>  SCRIPT=$(ls -l $0 | awk '{ print $NF }')
>-@@ -91,7 +91,8 @@
>- DESC="CrashPlan Engine"
>- NAME=CrashPlanEngine
>- DAEMON=$TARGETDIR/lib/com.backup42.desktop.jar
>--PIDFILE="$TARGETDIR/${NAME}.pid"
>-+PIDFILE="/var/run/${NAME}.pid"
>-+: ${LOGDIR=/var/log/crashplan}
>- 
>- if [[ -f $TARGETDIR/install.vars ]]; then
>- 	. $TARGETDIR/install.vars
>diff --git a/sysutils/linux-crashplan/pkg-message b/sysutils/linux-crashplan/pkg-message
>new file mode 100644
>index 0000000..6e7f608
>--- /dev/null
>+++ b/sysutils/linux-crashplan/pkg-message
>@@ -0,0 +1,8 @@
>+For users upgrading from previous versions of CrashPlan, note that the headless
>+mode configuration has been changed significantly and older clients will no
>+longer connect. Please check the Code42 website for up to date instructions on
>+setting up a headless CrashPlan server.
>+
>+On FreeBSD, the authentication token file can be found in
>+/compat/linux/var/lib/CrashPlan/.ui_info
>+
>diff --git a/sysutils/linux-crashplan/pkg-plist b/sysutils/linux-crashplan/pkg-plist
>index eaa98bb..7dd22da 100644
>--- a/sysutils/linux-crashplan/pkg-plist
>+++ b/sysutils/linux-crashplan/pkg-plist
>@@ -38,6 +38,7 @@ share/crashplan/lang/txt_th.properties
> share/crashplan/lang/txt_tr.properties
> share/crashplan/lang/txt_zh.properties
> share/crashplan/lang/txt_zh_TW.properties
>+share/crashplan/lib/bcprov-jdk15on.jar
> share/crashplan/lib/c42_protolib.jar
> share/crashplan/lib/com.backup42.desktop.jar
> share/crashplan/lib/com.jniwrapper.jniwrap.jar
>@@ -45,6 +46,7 @@ share/crashplan/lib/com.jniwrapper.macpack.jar
> share/crashplan/lib/com.jniwrapper.winpack.jar
> share/crashplan/lib/commons-collections-3.2.1-mini.jar
> share/crashplan/lib/commons-jxpath-1.1.jar
>+share/crashplan/lib/guava-18.0.jar
> share/crashplan/lib/jna-3.2.5.jar
> share/crashplan/lib/json-20070829.jar
> share/crashplan/lib/json-lib-2.4.jar
>@@ -88,13 +90,5 @@ share/crashplan/upgrade/startDesktopSolaris.sh
> share/crashplan/upgrade/startFirst.sh
> share/crashplan/upgrade/startLinux.sh
> share/crashplan/upgrade/startSolaris.sh
>-@dirrmtry share/crashplan/upgrade/UpgradeUI
>-@dirrmtry share/crashplan/upgrade
>-@dirrmtry share/crashplan/skin
>-@dirrmtry share/crashplan/log
>-@dirrmtry share/crashplan/lib
>-@dirrmtry share/crashplan/lang
>-@dirrmtry share/crashplan/doc
>-@dirrmtry share/crashplan/conf
>-@dirrmtry share/crashplan/bin
>-@dirrmtry share/crashplan
>+@dir share/crashplan/log
>+@dir share/crashplan/upgrade/UpgradeUI

Actions: View

Attachments on bug 202027: 159442