Attachment 222938 Details for Bug 253978 – Fixes

[patch] Fixes

turnserver.diff (text/plain), 3.64 KB, created by Chris Rees on 2021-03-03 11:01:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Rees

Created: 2021-03-03 11:01:08 UTC

Size: 3.64 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 567057)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	coturn
> DISTVERSION=	4.5.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net
> 
> MAINTAINER=	yuri@FreeBSD.org
>@@ -15,14 +15,13 @@
> 
> USES=		gettext-runtime gmake mysql pkgconfig shebangfix sqlite ssl
> USE_GITHUB=	yes
>-
> SHEBANG_FILES=	examples/scripts/oauth.sh examples/scripts/restapi/shared_secret_maintainer.pl
> 
>+USE_RC_SUBR=	turnserver
>+
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-static --enable-shared --turndbdir=/var/db/${PORTNAME}
> 
>-SUB_FILES=	turnserver-service
>-
> DOCSDIR=	${PREFIX}/share/doc/turnserver
> EXAMPLESDIR=	${PREFIX}/share/examples/turnserver
> 
>@@ -32,7 +31,6 @@
> PORTEXAMPLES=	*
> 
> post-install:
>-	${INSTALL_SCRIPT} ${WRKDIR}/turnserver-service ${STAGEDIR}${PREFIX}/etc/rc.d/turnserver
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
> 
> .include <bsd.port.mk>
>Index: files/turnserver-service.in
>===================================================================
>--- files/turnserver-service.in	(revision 567057)
>+++ files/turnserver-service.in	(nonexistent)
>@@ -1,29 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD$
>-#
>-
>-#
>-# PROVIDE: turnserver
>-# REQUIRE: DAEMON
>-# BEFORE: mail
>-# KEYWORD: shutdown
>-#
>-
>-. /etc/rc.subr
>-
>-name="turnserver"
>-rcvar="${name}_enable"
>-command="%%PREFIX%%/bin/${name}"
>-pidfile="/var/run/${name}.pid"
>-required_files="%%PREFIX%%/etc/${name}.conf"
>-
>-load_rc_config ${name}
>-
>-: ${turnserver_enable="NO"}
>-: ${turnserver_flags="-o"}
>-: ${turnserver_configfile:=%%PREFIX%%/etc/$name.conf}
>-
>-command_args="-c ${turnserver_configfile} ${turnserver_flags}"
>-
>-run_rc_command "$1"
>
>Property changes on: files/turnserver-service.in
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Deleted: svn:nokeywords
>## -1 +0,0 ##
>-x
>\ No newline at end of property
>Index: files/turnserver.in
>===================================================================
>--- files/turnserver.in	(revision 567057)
>+++ files/turnserver.in	(working copy)
>@@ -2,28 +2,36 @@
> #
> # $FreeBSD$
> #
>-
>-#
> # PROVIDE: turnserver
> # REQUIRE: DAEMON
> # BEFORE: mail
> # KEYWORD: shutdown
>-#
> 
> . /etc/rc.subr
> 
>-name="turnserver"
>-rcvar="${name}_enable"
>-command="%%PREFIX%%/bin/${name}"
>-pidfile="/var/run/${name}.pid"
>-required_files="%%PREFIX%%/etc/${name}.conf"
>+name=turnserver
>+rcvar=turnserver_enable
>+desc=TURN and STUN server
> 
> load_rc_config ${name}
> 
>-: ${turnserver_enable="NO"}
>-: ${turnserver_flags="-o"}
>+: ${turnserver_enable:=NO}
> : ${turnserver_configfile:=%%PREFIX%%/etc/$name.conf}
> 
>-command_args="-c ${turnserver_configfile} ${turnserver_flags}"
>+command="%%PREFIX%%/bin/${name}"
>+required_files="%%PREFIX%%/etc/${name}.conf"
>+start_precmd=find_pidfile
>+stop_precmd=find_pidfile
>+status_precmd=find_pidfile
>+command_args="-o -c ${turnserver_configfile}"
> 
>+find_pidfile()
>+{
>+        if get_pidfile_from_conf pidfile $turnserver_configfile; then
>+                pidfile="$_pidfile_from_conf"
>+        else
>+                pidfile="/var/run/${name}.pid"
>+        fi
>+}
>+
> run_rc_command "$1"
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 567057)
>+++ pkg-plist	(working copy)
>@@ -5,7 +5,6 @@
> bin/turnutils_peer
> bin/turnutils_stunclient
> bin/turnutils_uclient
>-etc/rc.d/turnserver
> @sample etc/turnserver.conf.default etc/turnserver.conf
> include/turn/client/TurnMsgLib.h
> include/turn/client/ns_turn_ioaddr.h

Actions: View | Diff

Attachments on bug 253978: 222938