Date: Mon, 25 Mar 2019 14:44:54 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> 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 Message-ID: <201903251444.x2PEiscx072898@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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} }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903251444.x2PEiscx072898>