From nobody Mon Apr 29 14:03:49 2024 X-Original-To: dev-commits-ports-all@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 4VSlRn4CM9z5JP0Y; Mon, 29 Apr 2024 14:03:49 +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 4VSlRn3g51z4DBS; Mon, 29 Apr 2024 14:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714399429; 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=yf6pqICpdWDHDYbNCwe6X0vUbfbs6NdBkJlpGN745tw=; b=eR4ChrWmioCtULYDKXbmCvKFd6ybvRFZSj5kSlPH5EhMRncf1L6kKqSfHmz31baI6JsVSn AHjyQlnqGHZpreZZLgZKuwYCOSoWg4SIQ0Hl4SBRBcX9v35LZiiYCy7+hsk/TTAZBBykpB hIDSuJfBt+YsRuk/8/J4SaITuojn7FIVEnCJ1L3WUjHNbkv6ttuoNPK3cmNTE/u00jZ1Ca U0lKOhiXgbPgP6iwhuON7jBm3mgKcx9Bc24yD4e/UNYRUu02/UkMJF8I7ehS87xrPkSLEf AR58YltPuz04boxGgvht5UZ94fq3cdd23NPAMlU/Vkv8cOTWeQPVCVnLjj+7hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714399429; a=rsa-sha256; cv=none; b=G3bTBnPpNBNwH/NCDez4tirdsrH1RS8Mvwn2vH+hsJ911mOTjCPdvnyBm8McXOa8clhjiV NG9VAj5TZvZEzXPS9b7io4T0MtJPHys6peWCl9MC44nraZ0c30+z5yc7NjFiNuvEAmDKd4 ITi21m3cvQWH++MscU0lVxJPOh0nyAi/c8mxX4HngEMwmpFIiKX4XyzEGg7uTV9mbu/HXa rtZvR3eQB0NG+iLwubKQVwnH8S60ssQib3byYP9YAHfRGMr1t/5fYW5ImEKayfeXIqAX1R 86sozzeK52Yj/i5R9LXAE3PadrjVkKlL3mki8lCDiq7kwvMSjTA+cz2EgGIlOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714399429; 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=yf6pqICpdWDHDYbNCwe6X0vUbfbs6NdBkJlpGN745tw=; b=f2+zMfMQp7/wKJdB2U9+XwFV4BTPFEzx6G5zP0TxwUBWl5br5YgHUKauU+5Tjgx1Z+Bzli 0XjUvUGa0NWSbf4eYUetbkEZdh/kE99oxr9KLhVLkfJeoHF8ymAXOT1wBTfEg7NXeHUt4D Uey3qqMg/cNv4Mo4aPHiBl2zCPh3kDzg/MoenYbaIlQel6k4phTPGkdGmj9gQf5P4rCfrA IwjwX4vUHDruTMgsLxNWvfXsvHo/C6GhY4CsWX3s6Y1yaIChtInnlIhYU5YMqjSn2sj/cx 3RlY5cKLWXz3yLGv3wNq+IUHVXhBEs8ML2N7+JE9BcrMgCJ9Z2yg2IKkWPCJJg== 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 4VSlRn3G5Cz1BBH; Mon, 29 Apr 2024 14:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43TE3nL7028947; Mon, 29 Apr 2024 14:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TE3nGR028944; Mon, 29 Apr 2024 14:03:49 GMT (envelope-from git) Date: Mon, 29 Apr 2024 14:03:49 GMT Message-Id: <202404291403.43TE3nGR028944@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: 9d83b1839c8f - main - net-mgmt/zabbix64-server: Make service depend on mysql service List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d83b1839c8ffae135c4094e3a49a26cd133c874 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d83b1839c8ffae135c4094e3a49a26cd133c874 commit 9d83b1839c8ffae135c4094e3a49a26cd133c874 Author: Juraj Lutter AuthorDate: 2024-04-29 13:55:53 +0000 Commit: Juraj Lutter CommitDate: 2024-04-29 14:03:37 +0000 net-mgmt/zabbix64-server: Make service depend on mysql service When using zabbix64-server with MariaDB, rc.d/zabbix_server does not contain "REQUIRE: mysql". Therefore, when shutting down the host, mysql stops before zabbix_server and prevents zabbix_server from stopping. Fix this also for MYSQLDV option and also for zabbix64-proxy in addition to zabbix64-server. PR: 278629 --- net-mgmt/zabbix64-server/Makefile | 2 +- net-mgmt/zabbix64-server/files/zabbix_proxy.in | 3 +++ net-mgmt/zabbix64-server/files/zabbix_server.in | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/net-mgmt/zabbix64-server/Makefile b/net-mgmt/zabbix64-server/Makefile index 842d059282bb..ac94ca0b06ce 100644 --- a/net-mgmt/zabbix64-server/Makefile +++ b/net-mgmt/zabbix64-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= zabbix64 DISTVERSION= 6.4.14 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ PKGNAMESUFFIX?= -server diff --git a/net-mgmt/zabbix64-server/files/zabbix_proxy.in b/net-mgmt/zabbix64-server/files/zabbix_proxy.in index 274c75c29251..0ce9f01f549f 100644 --- a/net-mgmt/zabbix64-server/files/zabbix_proxy.in +++ b/net-mgmt/zabbix64-server/files/zabbix_proxy.in @@ -4,6 +4,9 @@ # REQUIRE: DAEMON %%PGSQL%%# REQUIRE: postgresql %%MYSQL%%# REQUIRE: mysql +%%MYSQLDV%%# REQUIRE: mysql +%%MDB5%%# REQUIRE: mysql +%%MDB6%%# REQUIRE: mysql # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to diff --git a/net-mgmt/zabbix64-server/files/zabbix_server.in b/net-mgmt/zabbix64-server/files/zabbix_server.in index 68e9f052734e..8a1fa48a890c 100644 --- a/net-mgmt/zabbix64-server/files/zabbix_server.in +++ b/net-mgmt/zabbix64-server/files/zabbix_server.in @@ -4,6 +4,9 @@ # REQUIRE: DAEMON %%PGSQL%%# REQUIRE: postgresql %%MYSQL%%# REQUIRE: mysql +%%MYSQLDV%%# REQUIRE: mysql +%%MDB5%%# REQUIRE: mysql +%%MDB6%%# REQUIRE: mysql # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to