Attachment 108764 Details for Bug 149673 – file.txt

file.txt

file.txt (text/plain), 1.69 KB, created by olivier on 2010-08-15 14:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: olivier

Created: 2010-08-15 14:30:03 UTC

Size: 1.69 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/www/shellinabox.orig/Makefile /usr/ports/www/shellinabox/Makefile
>--- /usr/ports/www/shellinabox.orig/Makefile	2010-08-15 09:48:51.000000000 +0200
>+++ /usr/ports/www/shellinabox/Makefile	2010-08-15 12:46:12.000000000 +0200
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	shellinabox
> PORTVERSION=	2.10
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
> DISTNAME=	${PORTNAME}-${PORTVERSION}
>diff -ruN --exclude=CVS /usr/ports/www/shellinabox.orig/files/shellinaboxd.in /usr/ports/www/shellinabox/files/shellinaboxd.in
>--- /usr/ports/www/shellinabox.orig/files/shellinaboxd.in	2010-08-15 09:48:51.000000000 +0200
>+++ /usr/ports/www/shellinabox/files/shellinaboxd.in	2010-08-15 12:41:22.000000000 +0200
>@@ -18,6 +18,8 @@
> # shellinaboxd_pidfile="/var/run/shellinabox.pid"
> # shellinaboxd_port="4200"
> # shellinaboxd_certdir="%%PREFIX%%/etc/shellinabox"
>+# shellinaboxd_certfile=""
>+# 	Example: shellinaboxd_certfile="/your/cert.pem"
> # shellinaboxd_flags=""
> 
> shellinaboxd_setfib() {
>@@ -49,8 +51,13 @@
> 
> pidfile=${shellinaboxd_pidfile:-"/var/run/shellinaboxd.pid"}
> 
>-required_dirs="${shellinaboxd_certdir}"
>+command_args="--group=shellinabox --user=shellinabox --port=${shellinaboxd_port} --background=${pidfile}"
> 
>-command_args="--group=shellinabox --user=shellinabox --port=${shellinaboxd_port} --cert=${shellinaboxd_certdir} --background=${pidfile}"
>+if [ "${shellinaboxd_certfile}" = "" ]; then
>+	required_dirs="${shellinaboxd_certdir}"
>+	command_args="$command_args --cert=${shellinaboxd_certdir}"
>+else
>+	command_args="$command_args --cert-fd=3 3< ${shellinaboxd_certfile}"
>+fi
> 
> run_rc_command "$1"
>===> Done

Actions: View

Attachments on bug 149673: 108764