From owner-svn-ports-head@FreeBSD.ORG Thu Oct 23 00:36:48 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B369C3B1; Thu, 23 Oct 2014 00:36:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9EC82B2A; Thu, 23 Oct 2014 00:36:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9N0amWb075018; Thu, 23 Oct 2014 00:36:48 GMT (envelope-from wg@FreeBSD.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9N0albf075015; Thu, 23 Oct 2014 00:36:47 GMT (envelope-from wg@FreeBSD.org) Message-Id: <201410230036.s9N0albf075015@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: wg set sender to wg@FreeBSD.org using -f From: William Grzybowski Date: Thu, 23 Oct 2014 00:36:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371372 - in head/sysutils/linux-crashplan: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 00:36:48 -0000 Author: wg Date: Thu Oct 23 00:36:47 2014 New Revision: 371372 URL: https://svnweb.freebsd.org/changeset/ports/371372 QAT: https://qat.redports.org/buildarchive/r371372/ Log: sysutils/linux-crashplan: make sure poll selector is set from rc - CrashPlan in place update can overwrite our run.conf preventing it from working [1] - Update to 3.6.4 PR: 194465 [1] Modified: head/sysutils/linux-crashplan/Makefile head/sysutils/linux-crashplan/distinfo head/sysutils/linux-crashplan/files/crashplan.in Modified: head/sysutils/linux-crashplan/Makefile ============================================================================== --- head/sysutils/linux-crashplan/Makefile Wed Oct 22 23:56:02 2014 (r371371) +++ head/sysutils/linux-crashplan/Makefile Thu Oct 23 00:36:47 2014 (r371372) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= linux-crashplan -DISTVERSION= 3.6.3 -PORTREVISION= 1 +DISTVERSION= 3.6.4 CATEGORIES= sysutils linux MASTER_SITES= http://download.crashplan.com/installs/linux/install/CrashPlan/ -DISTNAME= CrashPlan_3.6.3_Linux +DISTNAME= CrashPlan_${DISTVERSION}_Linux MAINTAINER= wg@FreeBSD.org COMMENT= Backs up data to remote servers or hard drives @@ -29,10 +28,6 @@ NO_BUILD= yes CRASHDIR= ${PREFIX}/share/crashplan -post-patch: - @${REINPLACE_CMD} 's/SRV_JAVA_OPTS="/SRV_JAVA_OPTS="-Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.PollSelectorProvider /' ${WRKSRC}/scripts/run.conf - @${REINPLACE_CMD} 's/GUI_JAVA_OPTS="/GUI_JAVA_OPTS="-Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.PollSelectorProvider /' ${WRKSRC}/scripts/run.conf - do-install: @${MKDIR} ${STAGEDIR}${CRASHDIR} cd ${STAGEDIR}${CRASHDIR} && ${CAT} ${WRKSRC}/CrashPlan_${DISTVERSION}.cpi | ${GZIP_CMD} -d -c - | ${CPIO} -i --no-preserve-owner Modified: head/sysutils/linux-crashplan/distinfo ============================================================================== --- head/sysutils/linux-crashplan/distinfo Wed Oct 22 23:56:02 2014 (r371371) +++ head/sysutils/linux-crashplan/distinfo Thu Oct 23 00:36:47 2014 (r371372) @@ -1,2 +1,2 @@ -SHA256 (CrashPlan_3.6.3_Linux.tgz) = 605580cfc6aecb3acdc10baa6afc448ac07d960dafdbaa2e35b92f61d877016c -SIZE (CrashPlan_3.6.3_Linux.tgz) = 21188654 +SHA256 (CrashPlan_3.6.4_Linux.tgz) = 63b3d2c11bc74221d20dbae136d2bdc14f1b1e3f2678294a99f06d545dbfbf76 +SIZE (CrashPlan_3.6.4_Linux.tgz) = 21213313 Modified: head/sysutils/linux-crashplan/files/crashplan.in ============================================================================== --- head/sysutils/linux-crashplan/files/crashplan.in Wed Oct 22 23:56:02 2014 (r371371) +++ head/sysutils/linux-crashplan/files/crashplan.in Thu Oct 23 00:36:47 2014 (r371372) @@ -10,13 +10,27 @@ name="crashplan" rcvar=${name}_enable -command="/usr/bin/cpuset -l 0 %%PREFIX%%/share/crashplan/bin/CrashPlanEngine" - +crashplan_bin="%%PREFIX%%/share/crashplan/bin" +command="${crashplan_bin}/CrashPlanEngine" pidfile="/var/run/CrashPlanEngine.pid" -start_precmd="install -d /var/log/crashplan" -start_cmd="${command} start" +crashplan_start() { + local crashplan_poll_selector + crashplan_poll_selector="-Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.PollSelectorProvider" + + /usr/bin/install -d /var/log/crashplan || exit 1 + + sed -E -e "s/-Djava.nio.channels.spi.SelectorProvider=[^[:blank:]]+//" \ + -e "s/SRV_JAVA_OPTS=\"/SRV_JAVA_OPTS=\"${crashplan_poll_selector} /" \ + -e "s/GUI_JAVA_OPTS=\"/GUI_JAVA_OPTS=\"${crashplan_poll_selector} /" \ + -i bak "${crashplan_bin}/run.conf" || exit 1 + + /usr/bin/cpuset -l 0 ${command} start +} + +start_cmd="${name}_start" stop_cmd="${command} stop" +status_cmd="${command} status" load_rc_config ${name} run_rc_command "$1"