Attachment 148464 Details for Bug 194465 – set poll selector from rc script instead of during install

[patch] set poll selector from rc script instead of during install

2014-10-19-poll-selector.patch (text/plain), 1.98 KB, created by Julie Koubova on 2014-10-19 12:52:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julie Koubova

Created: 2014-10-19 12:52:03 UTC

Size: 1.98 KB

patch

obsolete

>--- files/crashplan.in	2013-11-20 20:10:14.000000000 +0100
>+++ files/crashplan.in	2014-10-19 14:01:06.661832464 +0200
>@@ -10,12 +10,25 @@
> 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"
> 
> load_rc_config ${name}
>--- Makefile	2014-10-19 14:30:05.000000000 +0200
>+++ Makefile	2014-10-19 14:25:30.321737168 +0200
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	linux-crashplan
> DISTVERSION=	3.6.3
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils linux
> MASTER_SITES=	http://download.crashplan.com/installs/linux/install/CrashPlan/
> DISTNAME=	CrashPlan_3.6.3_Linux
>@@ -29,10 +29,6 @@
> 
> 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

Actions: View | Diff

Attachments on bug 194465: 148464