From nobody Fri Feb 17 12:43:37 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PJBLx2jRTz3sJ1R; Fri, 17 Feb 2023 12:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PJBLx2CWZz4Dl5; Fri, 17 Feb 2023 12:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676637817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUNpo7v+HfIbuQm7tn3KQHwfnfnjeQgWc5DaC/QZcUQ=; b=QlWfleAul9aFfZlYstuxbAsXJPig1CsVW4e9rXz6w6iPwgWcRfA3rcThpfrEgLds/QvanJ LW7I0XZFTwklTpVjKGOW3QEo7NHS6KYNV6SYwk/XG7XzrA9n0XvCpZyt+mCA2LfzxVVmEu /b/AtpeTx3TVrQTEdKAxxsb2o8gU7X/mQUKstk40WZieVqS5WgG2VJKjKacFZVU9nMJASX pQVqOvh82tf9ERZ4Z2ccLdhdLEDEt6agL8YpgYUCUfX7Fi1emuOETzqgFHOH0PNiqj/5dc kRZxKKr8X9zSWqbEoEFPfCD0LT4SgbiO+tnTFugnCWkJmdkPI8cP6x0ydsLs0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676637817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUNpo7v+HfIbuQm7tn3KQHwfnfnjeQgWc5DaC/QZcUQ=; b=D6oacZLm3a4v4a/KEXNKBCy0wimuBxwjXlzRm0BRd/3WPqK2qquxglBVPDqEMdhvSjNPCm 4fg4ELV8YPm/YfPZPPVuxdtEJWJn5X+1VG2X6ybdxX5iQhNB6BD4sC9tTMFxbYnJZspxBz OUjZpu6WyS9T7FQXO5+8PrTqpTOuOseSb8sYKDxRpwitPGFfAGB99Xr1mn5SNjXIb8XjVP zcOBGPiweQ+MUK03ylyrEGkfMYa8XYaAAgxf41Pc5RsMCwsL3RJ3RCYOjOS4rRrY9fmhUu 0/2Hd/VppSwE56PbVCk2qNznsLtkIPhU6rSdN4hdeeIzboje+rMrKoweSdHWAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676637817; a=rsa-sha256; cv=none; b=rkyNNaEqiu2OBLrpPwDhEu46XYveh7OFAx3VhuAuowxt5PJKruwUOtWGoaV3cCuWNwPF2O JBffxZxxTUXucPjpASnGq83Qk9Od/jovTe762gA+RJimWxzZvjQrgq9u1U8zjQTBOG+8fN awaT42A+m4DS1yBZS9CKD4H7+Obxi0Lc8YxxlssHfYb2LXz2O6aStO3cNR9nzBJKUxXrPR kmkjOniyX0Rc6aIPdjWlvY2UKT6scBw7KQ7sTXcTFcjufWKSFCBHIbkD22ssKHp0/6lSOo rrhZoMnHN1QVSEcZw3A00uOy0PXmE52SYKl5ODvn0xChSa08cJ+ep5qOfEHMDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PJBLx1H34zk5D; Fri, 17 Feb 2023 12:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31HChbMf083590; Fri, 17 Feb 2023 12:43:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31HChbWA083589; Fri, 17 Feb 2023 12:43:37 GMT (envelope-from git) Date: Fri, 17 Feb 2023 12:43:37 GMT Message-Id: <202302171243.31HChbWA083589@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dries Michiels Subject: git: 6e69b81986b9 - main - multimedia/emby-server(-devel): correctly stop the master process List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: driesm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e69b81986b9412fcc3e06af7d37491236fe0504 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e69b81986b9412fcc3e06af7d37491236fe0504 commit 6e69b81986b9412fcc3e06af7d37491236fe0504 Author: Julien Cassette AuthorDate: 2023-02-17 12:00:05 +0000 Commit: Dries Michiels CommitDate: 2023-02-17 12:42:15 +0000 multimedia/emby-server(-devel): correctly stop the master process When passing -r to daemon, the supervisor process should be stopped. When stopping the child process it will just be restarted again. This fixes the rc script in that it correctly shuts down the daemon process. Pull Request: https://github.com/freebsd/freebsd-ports/pull/150 Pull Request: https://github.com/freebsd/freebsd-ports/pull/159 --- multimedia/emby-server-devel/Makefile | 2 +- multimedia/emby-server-devel/files/emby-server.in | 3 +-- multimedia/emby-server/Makefile | 2 +- multimedia/emby-server/files/emby-server.in | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/multimedia/emby-server-devel/Makefile b/multimedia/emby-server-devel/Makefile index 8ff8f364288d..6098d9366032 100644 --- a/multimedia/emby-server-devel/Makefile +++ b/multimedia/emby-server-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= emby-server DISTVERSION= 4.8.0.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${DISTVERSION}/ \ https://mediabrowser.github.io/embytools/ diff --git a/multimedia/emby-server-devel/files/emby-server.in b/multimedia/emby-server-devel/files/emby-server.in index 8057bdcba11f..d5b9bdb4cf97 100644 --- a/multimedia/emby-server-devel/files/emby-server.in +++ b/multimedia/emby-server-devel/files/emby-server.in @@ -44,9 +44,8 @@ load_rc_config ${name} : ${%%RC_NAME%%_pid:="/var/run/%%PORTNAME%%.pid"} pidfile="${%%RC_NAME%%_pid}" -procname="%%PREFIX%%/lib/emby-server/system/EmbyServer" command="/usr/sbin/daemon" -command_args="-r -f -p ${%%RC_NAME%%_pid} ${procname} \ +command_args="-r -f -P ${%%RC_NAME%%_pid} %%PREFIX%%/lib/emby-server/system/EmbyServer \ -os freebsd \ -ffdetect ${%%RC_NAME%%_ffdetect} \ -ffmpeg ${%%RC_NAME%%_ffmpeg} \ diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile index 7ea30b515674..c93bd1421dd2 100644 --- a/multimedia/emby-server/Makefile +++ b/multimedia/emby-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= emby-server DISTVERSION= 4.7.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${DISTVERSION}/ \ https://mediabrowser.github.io/embytools/ diff --git a/multimedia/emby-server/files/emby-server.in b/multimedia/emby-server/files/emby-server.in index 8057bdcba11f..d5b9bdb4cf97 100644 --- a/multimedia/emby-server/files/emby-server.in +++ b/multimedia/emby-server/files/emby-server.in @@ -44,9 +44,8 @@ load_rc_config ${name} : ${%%RC_NAME%%_pid:="/var/run/%%PORTNAME%%.pid"} pidfile="${%%RC_NAME%%_pid}" -procname="%%PREFIX%%/lib/emby-server/system/EmbyServer" command="/usr/sbin/daemon" -command_args="-r -f -p ${%%RC_NAME%%_pid} ${procname} \ +command_args="-r -f -P ${%%RC_NAME%%_pid} %%PREFIX%%/lib/emby-server/system/EmbyServer \ -os freebsd \ -ffdetect ${%%RC_NAME%%_ffdetect} \ -ffmpeg ${%%RC_NAME%%_ffmpeg} \