From owner-svn-ports-all@freebsd.org Mon Mar 25 14:44:56 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 088DC1563BD4; Mon, 25 Mar 2019 14:44:56 +0000 (UTC) (envelope-from feld@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 995746F59F; Mon, 25 Mar 2019 14:44:55 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 50F3094A2; Mon, 25 Mar 2019 14:44:55 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2PEitOP072902; Mon, 25 Mar 2019 14:44:55 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2PEiscx072898; Mon, 25 Mar 2019 14:44:54 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201903251444.x2PEiscx072898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 25 Mar 2019 14:44:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496825 - in head/multimedia: plexmediaserver plexmediaserver-plexpass plexmediaserver-plexpass/files plexmediaserver/files X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head/multimedia: plexmediaserver plexmediaserver-plexpass plexmediaserver-plexpass/files plexmediaserver/files X-SVN-Commit-Revision: 496825 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 995746F59F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Mar 2019 14:44:56 -0000 Author: feld Date: Mon Mar 25 14:44:54 2019 New Revision: 496825 URL: https://svnweb.freebsd.org/changeset/ports/496825 Log: multimedia/plexmediaserver{-plexpass}: Improve service shutdown reliability Plex child worker processes don't handle TERM PR: 236104 Modified: head/multimedia/plexmediaserver-plexpass/Makefile head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in head/multimedia/plexmediaserver/Makefile head/multimedia/plexmediaserver/files/plexmediaserver.in Modified: head/multimedia/plexmediaserver-plexpass/Makefile ============================================================================== --- head/multimedia/plexmediaserver-plexpass/Makefile Mon Mar 25 14:32:09 2019 (r496824) +++ head/multimedia/plexmediaserver-plexpass/Makefile Mon Mar 25 14:44:54 2019 (r496825) @@ -3,7 +3,7 @@ PORTVERSION= 1.15.2.793 DISTVERSIONSUFFIX=782228f99 -PORTREVISION= 0 +PORTREVISION= 1 MASTER_SITES= https://downloads.plex.tv/plex-media-server-new/${DISTVERSION}-${DISTVERSIONSUFFIX}/freebsd/ PKGNAMESUFFIX= -plexpass DISTNAME= PlexMediaServer-${DISTVERSION}-${DISTVERSIONSUFFIX}-FreeBSD-${ARCH} @@ -19,7 +19,5 @@ FILESDIR= ${.CURDIR}/files DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} SUB_LIST= PORTNAME=${PORTNAME}_plexpass DATADIR=${DATADIR} USERS=${USERS} GROUPS=${GROUPS} - -RUN_DEPENDS= # No longer require FreeBSD compat libs .include "${MASTERDIR}/Makefile" Modified: head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in ============================================================================== --- head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in Mon Mar 25 14:32:09 2019 (r496824) +++ head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in Mon Mar 25 14:44:54 2019 (r496825) @@ -96,7 +96,7 @@ plex_stop_postcmd() { _PLEX_CHILDREN=$(pgrep -g ${_PLEXPID}) echo "Cleaning up leftover child processes." - kill $sig_stop ${_PLEX_CHILDREN} + kill -9 ${_PLEX_CHILDREN} wait_for_pids ${_PLEX_CHILDREN} } Modified: head/multimedia/plexmediaserver/Makefile ============================================================================== --- head/multimedia/plexmediaserver/Makefile Mon Mar 25 14:32:09 2019 (r496824) +++ head/multimedia/plexmediaserver/Makefile Mon Mar 25 14:44:54 2019 (r496825) @@ -4,7 +4,7 @@ PORTNAME= plexmediaserver PORTVERSION?= 1.15.2.793 DISTVERSIONSUFFIX?=782228f99 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia MASTER_SITES?= https://downloads.plex.tv/plex-media-server-new/${DISTVERSION}-${DISTVERSIONSUFFIX}/freebsd/ DISTNAME?= PlexMediaServer-${DISTVERSION}-${DISTVERSIONSUFFIX}-FreeBSD-${ARCH} Modified: head/multimedia/plexmediaserver/files/plexmediaserver.in ============================================================================== --- head/multimedia/plexmediaserver/files/plexmediaserver.in Mon Mar 25 14:32:09 2019 (r496824) +++ head/multimedia/plexmediaserver/files/plexmediaserver.in Mon Mar 25 14:44:54 2019 (r496825) @@ -96,7 +96,7 @@ plex_stop_postcmd() { _PLEX_CHILDREN=$(pgrep -g ${_PLEXPID}) echo "Cleaning up leftover child processes." - kill $sig_stop ${_PLEX_CHILDREN} + kill -9 ${_PLEX_CHILDREN} wait_for_pids ${_PLEX_CHILDREN} }