Attachment 185095 Details for Bug 220926 – Patch proposal for Crashplan 4.8.3

[patch] Patch proposal for Crashplan 4.8.3

crashplan-patch.txt (text/plain), 7.23 KB, created by Dan Moutal on 2017-08-06 17:08:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Moutal

Created: 2017-08-06 17:08:56 UTC

Size: 7.23 KB

patch

obsolete

>diff -rupN linux-crashplan.orig/Makefile linux-crashplan/Makefile
>--- linux-crashplan.orig/Makefile	2017-05-07 18:35:51.936332823 -0700
>+++ linux-crashplan/Makefile	2017-05-07 18:41:51.839719146 -0700
>@@ -2,8 +2,8 @@
> # $FreeBSD: head/sysutils/linux-crashplan/Makefile 421496 2016-09-07 12:43:22Z tijl $
> 
> PORTNAME=	crashplan
>-DISTVERSION=	4.7.0
>-PORTREVISION=	1
>+DISTVERSION=	4.8.3
>+PORTREVISION=	0
> CATEGORIES=	sysutils java linux
> MASTER_SITES=	https://download.code42.com/installs/linux/install/CrashPlan/
> PKGNAMEPREFIX=	linux-
>@@ -35,7 +35,11 @@ LOGDIR=		/var/log/crashplan
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${CRASHDIR}
>+	@${MKDIR} ${STAGEDIR}${CRASHDIR}/lang
> 	cd ${STAGEDIR}${CRASHDIR} && ${CAT} ${WRKSRC}/CrashPlan_${DISTVERSION}.cpi | ${GZIP_CMD} -d -c - | ${CPIO} -i --no-preserve-owner
>+	@${MV} ${STAGEDIR}${CRASHDIR}/lang/* ${STAGEDIR}${CRASHDIR}/conf/
>+	@${RMDIR} ${STAGEDIR}${CRASHDIR}/lang
>+	@cd ${STAGEDIR}${CRASHDIR} && ${LN} -s conf lang
> 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/CrashPlanDesktop ${STAGEDIR}${PREFIX}/bin/
> 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/CrashPlanEngine ${STAGEDIR}${CRASHDIR}/bin/
> 	${CP} ${WRKSRC}/scripts/run.conf ${STAGEDIR}${CRASHDIR}/bin/
>diff -rupN linux-crashplan.orig/distinfo linux-crashplan/distinfo
>--- linux-crashplan.orig/distinfo	2017-05-07 18:35:51.929067007 -0700
>+++ linux-crashplan/distinfo	2017-05-07 18:41:15.915418322 -0700
>@@ -1,2 +1,2 @@
>-SHA256 (CrashPlan_4.7.0_Linux.tgz) = bb3c52259cf56759c004b9c3126a8c483bf1795f2bfa4575d35de2cdb577a0e4
>-SIZE (CrashPlan_4.7.0_Linux.tgz) = 47479484
>+SHA256 (CrashPlan_4.8.3_Linux.tgz) = c25d87ec1d442a396b668547e39b70d66dcfe02250cc57a25916ebb42a407113
>+SIZE (CrashPlan_4.8.3_Linux.tgz) = 47086668
>diff -rupN linux-crashplan.orig/pkg-plist linux-crashplan/pkg-plist
>--- linux-crashplan.orig/pkg-plist	2017-05-07 18:35:51.936161212 -0700
>+++ linux-crashplan/pkg-plist	2017-05-07 18:49:25.496423040 -0700
>@@ -3,7 +3,6 @@ bin/CrashPlanDesktop
> %%DATADIR%%/bin/CrashPlanEngine
> %%DATADIR%%/bin/restartLinux.sh
> %%DATADIR%%/bin/run.conf
>-%%DATADIR%%/conf/custom_sample.properties
> %%DATADIR%%/conf/default.service.xml
> %%DATADIR%%/conf/service.log.xml
> %%DATADIR%%/conf/ui.log.xml
>@@ -32,30 +31,35 @@ bin/CrashPlanDesktop
> %%DATADIR%%/lang/txt_th.properties
> %%DATADIR%%/lang/txt_zh.properties
> %%DATADIR%%/lang/txt_zh_TW.properties
>-%%DATADIR%%/lib/aopalliance.jar
>-%%DATADIR%%/lib/bcpkix-jdk15on.jar
>-%%DATADIR%%/lib/bcprov-jdk15on.jar
>-%%DATADIR%%/lib/c42-shared-engine.jar
>-%%DATADIR%%/lib/c42_protolib_client.jar
>-%%DATADIR%%/lib/c42_protolib_shared.jar
>+%%DATADIR%%/lib/aopalliance-1.0.jar
>+%%DATADIR%%/lib/bcpkix-jdk15on-1.49.jar
>+%%DATADIR%%/lib/bcprov-jdk15on-1.49.jar
>+%%DATADIR%%/lib/c42-shared-engine-release_5.1.0_2015.09.19-13.24.30_e02dde1eec51.jar
>+%%DATADIR%%/lib/c42_protolib_client-1.0.2.jar
>+%%DATADIR%%/lib/c42_protolib_control-1.0.1.jar
>+%%DATADIR%%/lib/c42_protolib_control-sources-1.0.1.jar
>+%%DATADIR%%/lib/c42_protolib_shared-1.0.30.jar
>+%%DATADIR%%/lib/c42_protolib_shared-sources-1.0.30.jar
> %%DATADIR%%/lib/com.backup42.desktop.jar
> %%DATADIR%%/lib/comfyj-2.10.jar
>-%%DATADIR%%/lib/commons-beanutils-core.jar
>+%%DATADIR%%/lib/common-3.6.100.v20120522-1841.jar
>+%%DATADIR%%/lib/commons-beanutils-1.7.0.jar
>+%%DATADIR%%/lib/commons-beanutils-bean-collections-1.7.0.jar
>+%%DATADIR%%/lib/commons-beanutils-core-1.7.0.jar
> %%DATADIR%%/lib/commons-cli-1.2.jar
>-%%DATADIR%%/lib/commons-codec.jar
>-%%DATADIR%%/lib/commons-collections.jar
>-%%DATADIR%%/lib/commons-io.jar
>-%%DATADIR%%/lib/commons-jxpath-1.1.jar
>-%%DATADIR%%/lib/commons-lang.jar
>-%%DATADIR%%/lib/commons-logging.jar
>-%%DATADIR%%/lib/ezmorph.jar
>-%%DATADIR%%/lib/gson.jar
>-%%DATADIR%%/lib/guava.jar
>-%%DATADIR%%/lib/guice.jar
>-%%DATADIR%%/lib/guice-multibindings.jar
>-%%DATADIR%%/lib/javassist-3.20.0.jar
>-%%DATADIR%%/lib/javax.inject.jar
>-%%DATADIR%%/lib/javax.servlet-api-jar.jar
>+%%DATADIR%%/lib/commons-codec-1.8.jar
>+%%DATADIR%%/lib/commons-collections-3.2.1.jar
>+%%DATADIR%%/lib/commons-io-2.4.jar
>+%%DATADIR%%/lib/commons-lang-2.6.jar
>+%%DATADIR%%/lib/commons-logging-1.1.3.jar
>+%%DATADIR%%/lib/ezmorph-1.0.4.jar
>+%%DATADIR%%/lib/gson-2.3.1.jar
>+%%DATADIR%%/lib/guava-18.0.jar
>+%%DATADIR%%/lib/guice-4.0.jar
>+%%DATADIR%%/lib/guice-multibindings-4.0.jar
>+%%DATADIR%%/lib/javassist-3.20.0-GA.jar
>+%%DATADIR%%/lib/javax.inject-1.jar
>+%%DATADIR%%/lib/javax.servlet-api-3.1.0.jar
> %%DATADIR%%/lib/jcip-annotations-1.0-1.jar
> %%DATADIR%%/lib/jetty-continuation-9.2.9.v20150224.jar
> %%DATADIR%%/lib/jetty-http-9.2.9.v20150224.jar
>@@ -65,45 +69,43 @@ bin/CrashPlanDesktop
> %%DATADIR%%/lib/jetty-servlet-9.2.9.v20150224.jar
> %%DATADIR%%/lib/jetty-servlets-9.2.9.v20150224.jar
> %%DATADIR%%/lib/jetty-util-9.2.9.v20150224.jar
>-%%DATADIR%%/lib/jna-platform.jar
>-%%DATADIR%%/lib/jna.jar
>-%%DATADIR%%/lib/jniwrap.jar
>-%%DATADIR%%/lib/jniwrapper-macpack.jar
>-%%DATADIR%%/lib/jniwrapper-winpack.jar
>-%%DATADIR%%/lib/joda-time.jar
>-%%DATADIR%%/lib/json-lib.jar
>-%%DATADIR%%/lib/json.jar
>-%%DATADIR%%/lib/jtux.jar
>-%%DATADIR%%/lib/log4j-api.jar
>-%%DATADIR%%/lib/log4j-core.jar
>+%%DATADIR%%/lib/jface-3.8.101.v20120817-083647.jar
>+%%DATADIR%%/lib/jna-4.1.0.jar
>+%%DATADIR%%/lib/jna-platform-4.1.0.jar
>+%%DATADIR%%/lib/jniwrapper-3.8.4.jar
>+%%DATADIR%%/lib/jniwrapper-winpack-3.8.4.jar
>+%%DATADIR%%/lib/joda-time-2.8.1.jar
>+%%DATADIR%%/lib/json-20070829.jar
>+%%DATADIR%%/lib/json-lib-2.4.jar
>+%%DATADIR%%/lib/jtux-1.0.0.jar
>+%%DATADIR%%/lib/log4j-api-2.1.jar
>+%%DATADIR%%/lib/log4j-core-2.1.jar
> %%DATADIR%%/lib/log4j-iostreams-2.3.jar
> %%DATADIR%%/lib/log4j-jcl-2.1.jar
>-%%DATADIR%%/lib/log4j-slf4j-impl.jar
>-%%DATADIR%%/lib/metrics-core.jar
>-%%DATADIR%%/lib/miglayout15-swt.jar
>-%%DATADIR%%/lib/netty-all.jar
>-%%DATADIR%%/lib/org.eclipse.core.commands_3.6.1.v20120814-150512.jar
>-%%DATADIR%%/lib/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar
>-%%DATADIR%%/lib/org.eclipse.jface_3.8.101.v20120817-083647.jar
>-%%DATADIR%%/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar
>-%%DATADIR%%/lib/protobuf-java.jar
>+%%DATADIR%%/lib/log4j-slf4j-impl-2.1.jar
>+%%DATADIR%%/lib/metrics-core-3.0.1.jar
>+%%DATADIR%%/lib/miglayout-swt-0.0.0_c42_legacy.jar
>+%%DATADIR%%/lib/netty-all-4.1.3.Final.jar
>+%%DATADIR%%/lib/org.eclipse.core.commands-3.6.1.v20120814-150512.jar
>+%%DATADIR%%/lib/org.eclipse.swt.gtk.linux.x86.jar
>+%%DATADIR%%/lib/org.eclipse.swt.gtk.linux.x86_64.jar
>+%%DATADIR%%/lib/osgi-3.8.1.v20120830-144521.jar
>+%%DATADIR%%/lib/owasp-java-html-sanitizer-20160628.1.jar
>+%%DATADIR%%/lib/protobuf-java-2.6.1.jar
> %%DATADIR%%/lib/reflections-0.9.10.jar
>-%%DATADIR%%/lib/rhino.jar
>-%%DATADIR%%/lib/sbbi-upnplib.jar
>-%%DATADIR%%/lib/slf4j-api.jar
>-%%DATADIR%%/lib/sqlite-jdbc.jar
>-%%DATADIR%%/lib/swt-64.jar
>-%%DATADIR%%/lib/swt.jar
>+%%DATADIR%%/lib/rhino-1.7R3.jar
>+%%DATADIR%%/lib/slf4j-api-1.6.1.jar
>+%%DATADIR%%/lib/sqlite-jdbc-3.7.15-M1.jar
> %%DATADIR%%/lib/tika-core-1.7.jar
>-%%DATADIR%%/lib/trove.jar
>-%%DATADIR%%/lib/twitter4j.jar
>+%%DATADIR%%/lib/trove4j-3.0.2.jar
>+%%DATADIR%%/lib/twitter4j-core-3.0.3.jar
> %%DATADIR%%/lib/websocket-api-9.2.9.v20150224.jar
> %%DATADIR%%/lib/websocket-common-9.2.9.v20150224.jar
> %%DATADIR%%/lib/websocket-server-9.2.9.v20150224.jar
> %%DATADIR%%/lib/websocket-servlet-9.2.9.v20150224.jar
>+%%DATADIR%%/lib/weupnp-0.1.4.jar
> %%DATADIR%%/libc42archive.so
> %%DATADIR%%/libc42archive64.so
>-%%DATADIR%%/libc42core.so
> %%DATADIR%%/libjniwrap.so
> %%DATADIR%%/libjniwrap64.so
> %%DATADIR%%/libjtux.so

Flags:

subtil: maintainer-approval+

Actions: View | Diff

Attachments on bug 220926: 184599 | 185069 | 185095 | 185182