From nobody Fri Apr 10 20:44:31 2026 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 4fsph03dqQz6YMqC for ; Fri, 10 Apr 2026 20:44:32 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fsph015zPz3Fw9 for ; Fri, 10 Apr 2026 20:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775853872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KUVdnorKdcQ8KLb7Ski1rjxszqzc+20M7rDEkswKxL4=; b=CZjoUkoER/Q9uoy2INcQt+nyh/pcQSZxBtqGgq3VFsi2XJFax3Miuffo6yTaiFS6gN9qid V0lHO+PIEQXvgyNlsD46wUJDMBXiRZDm8yMXx1pRVHmlzkP0ggnE1pttfTZmUsQA+m+NPn J2f8X126hwCZoActIBilggSH1XAdD8PdeIZ/iKutdcHkuXkvSrjeCIjAzOvGv4SFnnMBp0 wzZfJdfYXLDEPMGFPL26mPTcbb8rUCLj4eiQEqt3kMBCM3XYBxPCVcsrKDOihdli8OYNTq MlQEfE5NjFvypG+7fV404fyPkg+pUG7XxJ7eVouszBhV2qm1uHtN6yBbZfqotA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775853872; a=rsa-sha256; cv=none; b=MzfXkBqLqfygxaVhVtQVmUFUP4ST8asezdCOVLksn8zJBrjnd06ZNG8gRCMbtKe/NQWSOg qV4huC0NC5h/5QH9Fzi/E+CjHT4i82o5Dolp601cC+NAlrGGx6lOwyvkNjOHQSoI26/qXF P0HsXDKsXg9rWKbdo9j8NGEami0TMiVAtwhusvBUKBysYY12dOowJLeTX4rewy/ZkjofjJ ZFRrZ0Hr8CZv8F2OQ8dfNJB/qOu55Zcu/PpDHDiZInKq9tsH+5aNUg1t7DAML4bXFwpApj jApXm9BhJtBqFx1upeIUM3euDfbUHBnsS7vZjDF0tuDdkmbMkkkAnycFs68tmQ== 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=1775853872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KUVdnorKdcQ8KLb7Ski1rjxszqzc+20M7rDEkswKxL4=; b=iWi2jUkTlASngjzAU8rDtvJkSXnbPVy4VM+M+yBujBpkfxsfbku6Au8CUv2tRgHsRmgVVw EiVXZDGpgYRC9I1tMLjmn0pCVuM7eK7R3pHRIfQl0TU0rfKx0GLSaBecmgJj6Tw3s/tDLx 4p3TddCz6lHLN/d7XAHY2vguBRB3UGENgJ2gC/7vAuoYiS997XMlM/O+zALBAk2wrLyWMk c6txNw0SJG1u+7zjDZOwUe5f5+o6eQGW3OUfzAB9u38r6aYyJjrPJ9vJe87uIUVnyffx/X vaODKxaEgQMKR32mlClJ4IkNkiDekW9sggddh9jQesrNUJiYrPWqm5MPQ5HQQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fspgz6pZHz1141 for ; Fri, 10 Apr 2026 20:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 459d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 20:44:31 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Boris Korzun From: Yusuf Yaman Subject: git: 64b3e5969883 - main - net/mtg: Update 2.2.6 => 2.2.8 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nxjoseph X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64b3e5969883b4679b3dc1dda34a1cdf6442ff85 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 20:44:31 +0000 Message-Id: <69d9612f.459d2.507ad1f@gitrepo.freebsd.org> The branch main has been updated by nxjoseph: URL: https://cgit.FreeBSD.org/ports/commit/?id=64b3e5969883b4679b3dc1dda34a1cdf6442ff85 commit 64b3e5969883b4679b3dc1dda34a1cdf6442ff85 Author: Boris Korzun AuthorDate: 2026-04-10 20:35:27 +0000 Commit: Yusuf Yaman CommitDate: 2026-04-10 20:44:08 +0000 net/mtg: Update 2.2.6 => 2.2.8 Changelogs: * https://github.com/9seconds/mtg/releases/tag/v2.2.7 * https://github.com/9seconds/mtg/releases/tag/v2.2.8 Port changes: * Add pkg-post-install script to change default secret in the configuration file for security purposes. PR: 294300 Reported by: Oleg Streejak Approved by: Boris Korzun (maintainer) Approved by: osa (mentor) MFH: 2026Q2 --- net/mtg/Makefile | 7 +++---- net/mtg/distinfo | 10 +++++----- net/mtg/files/mtg.in | 12 +++++++----- net/mtg/pkg-post-install | 23 +++++++++++++++++++++++ 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/net/mtg/Makefile b/net/mtg/Makefile index 9faefb41312a..655004eceabd 100644 --- a/net/mtg/Makefile +++ b/net/mtg/Makefile @@ -1,7 +1,6 @@ PORTNAME= mtg DISTVERSIONPREFIX= v -DISTVERSION= 2.2.6 -PORTREVISION= 1 +DISTVERSION= 2.2.8 CATEGORIES= net MAINTAINER= drtr0jan@yandex.ru @@ -21,8 +20,8 @@ GO_BUILDFLAGS+= -ldflags "-s -w -X main.version=${DISTVERSION}" -tags netgo MTG_USER?= ${WWWOWN} MTG_GROUP?= ${WWWGRP} -SUB_LIST+= MTG_USER=${MTG_USER} \ - MTG_GROUP=${MTG_GROUP} +SUB_LIST+= USER=${MTG_USER} \ + GROUP=${MTG_GROUP} PLIST_FILES= bin/${PORTNAME} \ "@dir(${MTG_USER},${MTG_GROUP},750) ${ETCDIR}" \ diff --git a/net/mtg/distinfo b/net/mtg/distinfo index 31c21eb5ae4f..37c2c5a8978f 100644 --- a/net/mtg/distinfo +++ b/net/mtg/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1774942347 -SHA256 (go/net_mtg/mtg-v2.2.6/v2.2.6.mod) = 33791188bbc3f4dc1a1cdba85d23a418d39ec45d2cf27c3236e5ae0fcf9ea75d -SIZE (go/net_mtg/mtg-v2.2.6/v2.2.6.mod) = 2157 -SHA256 (go/net_mtg/mtg-v2.2.6/v2.2.6.zip) = 6279e51c042a4fc38eed9dd269c964740c1c56429ee6a153b1c44cdbd3c3ff11 -SIZE (go/net_mtg/mtg-v2.2.6/v2.2.6.zip) = 283688 +TIMESTAMP = 1775586509 +SHA256 (go/net_mtg/mtg-v2.2.8/v2.2.8.mod) = 8d5b04ab6c55162732db5971d339ea314f85c34df9bed33eb5c5d2463635b8bf +SIZE (go/net_mtg/mtg-v2.2.8/v2.2.8.mod) = 2157 +SHA256 (go/net_mtg/mtg-v2.2.8/v2.2.8.zip) = db8e1aa5e60227c8449a951ec2973bbd0a7ef5d7fde72b816c060bd27d118a2b +SIZE (go/net_mtg/mtg-v2.2.8/v2.2.8.zip) = 294559 diff --git a/net/mtg/files/mtg.in b/net/mtg/files/mtg.in index cdac18b52f07..ccab8a9da600 100644 --- a/net/mtg/files/mtg.in +++ b/net/mtg/files/mtg.in @@ -13,8 +13,9 @@ # mtg_group (group): Set group to run mtg. # Default is "wheel". # mtg_args (str): Set flags used with mtg. -# Default is "". Use `mtg --help` to get instruction. -# mtg_syslog_output_enable (string): Set to YES to enable syslog output +# Default is "run %%ETCDIR%%/config.toml". +# Use `mtg --help` to get instruction. +# mtg_syslog_output_enable (bool): Set to YES to enable syslog output # Default is "NO". See daemon(8). # mtg_syslog_output_tag (str): Set syslog tag if syslog enabled. # Default is "mtg". See daemon(8). @@ -30,9 +31,10 @@ rcvar=mtg_enable load_rc_config $name -: ${mtg_enable:=no} -: ${mtg_user:="%%MTG_USER%%"} -: ${mtg_group:="%%MTG_GROUP%%"} +: ${mtg_enable:="NO"} +: ${mtg_user:="%%USER%%"} +: ${mtg_group:="%%GROUP%%"} +: ${mtg_args:="run %%ETCDIR%%/config.toml"} : ${mtg_syslog_output_enable:="NO"} start_precmd="mtg_prestart" diff --git a/net/mtg/pkg-post-install b/net/mtg/pkg-post-install new file mode 100644 index 000000000000..2b29e55d500c --- /dev/null +++ b/net/mtg/pkg-post-install @@ -0,0 +1,23 @@ +#!/bin/sh + +DOMAIN="storage.googleapis.com" +DEFAULT_SECRET="ee367a189aee18fa31c190054efd4a8e9573746f726167652e676f6f676c65617069732e636f6d" + +generate_secret() { + echo ":: Generate new secret" + SECRET=`${PKG_PREFIX}/bin/mtg generate-secret --hex ${DOMAIN}` +} + +if grep -q "^[^#]*secret = \"${DEFAULT_SECRET}\"$" ${PKG_PREFIX}/etc/mtg/config.toml +then + generate_secret + echo ":: Replace secret in ${PKG_PREFIX}/etc/mtg/config.toml" + /usr/bin/diff -q ${PKG_PREFIX}/etc/mtg/config.toml.sample ${PKG_PREFIX}/etc/mtg/config.toml >/dev/null || BAK=".bak" + /usr/bin/sed -i "${BAK}" "s/${DEFAULT_SECRET}/${SECRET}/g" ${PKG_PREFIX}/etc/mtg/config.toml +fi +if grep -q "${DEFAULT_SECRET}" ${PKG_PREFIX}/etc/mtg/config.toml.sample +then + [ ! ${SECRET} ] && generate_secret + echo ":: Replace secret in ${PKG_PREFIX}/etc/mtg/config.toml.sample" + /usr/bin/sed -i "" "s/${DEFAULT_SECRET}/${SECRET}/g" ${PKG_PREFIX}/etc/mtg/config.toml.sample +fi