Attachment 156920 Details for Bug 200314 – Patch sysutils/linux-crashplan to 4.2.0

Patch sysutils/linux-crashplan to 4.2.0

file_200314.txt (text/plain), 3.77 KB, created by Nuno Subtil on 2015-05-19 03:06:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Subtil

Created: 2015-05-19 03:06:19 UTC

Size: 3.77 KB

patch

obsolete

>diff --git a/sysutils/linux-crashplan/Makefile b/sysutils/linux-crashplan/Makefile
>index e3e5533..014068f 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.2.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..1a97562 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.2.0_Linux.tgz) = 634b651042be9e403cc687490ca66b3ff69ae88d9a3be1ea00b2db7931bed67c
>+SIZE (CrashPlan_4.2.0_Linux.tgz) = 24368380
>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-plist b/sysutils/linux-crashplan/pkg-plist
>index eaa98bb..c973f22 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

Actions: View

Attachments on bug 200314: 156920