From nobody Mon May 30 07:46:33 2022 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 490911B63616; Mon, 30 May 2022 07:46:34 +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 4LBSCZ1Wl3z3vl4; Mon, 30 May 2022 07:46:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653896794; 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=BL5vFwBITJagJfEl0AzsKG7WviCsfaAJyKGRva7Act8=; b=ktB/+Tv32qIDDB19DsqYDi0dNi7XJtY5l6txlzsWENrCuMOqQaTq9YfSYRSvMgST9u546R 5c/u+4hesDFUfsQTk1DXjnM61nfGZjOCjcboJG9E/wS3k9BRRH1g8KOrvEw6WDRPOEN0fQ pNKOKwWLr+j3/2fJTaO0sgH4A4yuYxfopZKN0xNu+LMchl+MVSkMhElIp34Ha4REEnWEtH mXDxL2vFf9+aYv+Tw/YDZ3/loQyTYiwxXIUgwfzC5yWIxbJipf+4NgFCGlnchyVB3ts+4l s6kgsWCEzs4M292J58p/u6KRjTLVA8YBIQysTvbawHiDRR4ociRer78MW9oFGQ== 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 13DCB135A3; Mon, 30 May 2022 07:46:34 +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 24U7kXPJ010689; Mon, 30 May 2022 07:46:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24U7kX6v010688; Mon, 30 May 2022 07:46:33 GMT (envelope-from git) Date: Mon, 30 May 2022 07:46:33 GMT Message-Id: <202205300746.24U7kX6v010688@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 06ded6839c74 - main - sysutils/webmin: update to 1.994 security release (+) 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06ded6839c74007687b0dee81cf3bcf76c3c27d4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653896794; 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=BL5vFwBITJagJfEl0AzsKG7WviCsfaAJyKGRva7Act8=; b=CVSqUgIk9HkJwXtJePcYFT8MySh078uGFoHnly5noz92ENRy+HJmUEWLqCC17ly908838V WRvwHw1mK90D0NazMGPJv6o352JVeoGnc9XMp6oEhXrrLc3h/eoiTDtP5a7awhe9oJaUiV gIErAC42Jg4wShw0ZCNZO7ZcM27nMs4jFHnbpXbR+yUJURNBVeml8VcJ9QXqK2YTDbhRkn HIQz/vnNnp7gHWr+cqgt9ObskIdK9Ugf1gPiolU7ksAov5+sdWjcfZ+KMj6uH9437Gogv9 /24WVD6uD56QbszyMOmnWuW74CVwTlRs6GvJo4xNatjtaytyoXl3tJSzp/qUqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653896794; a=rsa-sha256; cv=none; b=bohdctiVkpxbEDYXVY2q9H2BZgg/XoZ0LBl2bzSMd5uPsWzV9nrsHGLulhReXoebe845FU mIyFsDf2R4zHYr/A2aM5C4r5nUs7HiHa3cNOF3gQflb/vMd+GRKnAn0dEhHR4VobEKmWOs B4Frmdx32K1i1VuaSR1XQlzVMbWL52VG89H88e6CUtBT2Zbg6+0T8SHGrJLUYXbsyMalnv RN1OC+rbJ8iUs69NCqiaNEDOQ0W/SqBVGwKs9tVgoCIxn+VF+9ZGOx4AL8YMaIPWh/JbtT rxMX6U7bimQd1+qCA0aDjAfMWGQ/LiS0Qv1Ry71dV2550NxYpsttK2iFl42F8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=06ded6839c74007687b0dee81cf3bcf76c3c27d4 commit 06ded6839c74007687b0dee81cf3bcf76c3c27d4 Author: Dima Panov AuthorDate: 2022-05-30 07:45:21 +0000 Commit: Dima Panov CommitDate: 2022-05-30 07:45:21 +0000 sysutils/webmin: update to 1.994 security release (+) This release fixes a security issue in versions 1.991 and below. With hat: ports-secteam --- sysutils/webmin/Makefile | 2 +- sysutils/webmin/distinfo | 6 +++--- sysutils/webmin/files/patch-setup.sh | 34 +++++++++++++++--------------- sysutils/webmin/pkg-plist | 41 +++++++++++++++++++++++++++++++----- 4 files changed, 57 insertions(+), 26 deletions(-) diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index ead8cde6714d..7609a3b70732 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -1,7 +1,7 @@ # Created by: Andreas Klemm PORTNAME= webmin -PORTVERSION= 1.990 +PORTVERSION= 1.994 PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index 1854dfcdfbe6..658d35132ded 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646381553 -SHA256 (webmin-1.990.tar.gz) = 3e7814cac64fed9a94ad61b3ffda33c0eb81e6a56ac6812623b78b5601d13064 -SIZE (webmin-1.990.tar.gz) = 44585841 +TIMESTAMP = 1653891865 +SHA256 (webmin-1.994.tar.gz) = aee5ae6d73d6fb4904f03215efa8aa485e27fbf65b13aca726a8ab9723fea0ee +SIZE (webmin-1.994.tar.gz) = 44691491 diff --git a/sysutils/webmin/files/patch-setup.sh b/sysutils/webmin/files/patch-setup.sh index 387cd32a4f13..293144685590 100644 --- a/sysutils/webmin/files/patch-setup.sh +++ b/sysutils/webmin/files/patch-setup.sh @@ -1,6 +1,6 @@ ---- setup.sh.orig 2021-03-07 18:10:32 UTC +--- setup.sh.orig 2022-05-23 20:33:54 UTC +++ setup.sh -@@ -102,19 +102,7 @@ echo "Webmin uses separate directories for configurati +@@ -103,19 +103,7 @@ echo "" echo "Unless you want to run multiple versions of Webmin at the same time" echo "you can just accept the defaults." echo "" @@ -21,7 +21,7 @@ if [ ! -d $config_dir ]; then mkdir $config_dir; if [ $? != 0 ]; then -@@ -209,12 +197,12 @@ else +@@ -210,12 +198,12 @@ else fi # Ask for log directory @@ -36,7 +36,7 @@ fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -242,7 +230,9 @@ else +@@ -243,7 +231,9 @@ else echo "Webmin is written entirely in Perl. Please enter the full path to the" echo "Perl 5 interpreter on your system." echo "" @@ -47,7 +47,7 @@ perldef=/usr/bin/perl elif [ -x /usr/local/bin/perl ]; then perldef=/usr/local/bin/perl -@@ -443,6 +433,7 @@ else +@@ -444,6 +434,7 @@ else fi fi @@ -55,7 +55,7 @@ # Ask whether to run at boot time if [ "$atboot" = "" ]; then if echo "$os_type" | grep -q "\-linux$"; then -@@ -594,6 +585,7 @@ EOF +@@ -595,6 +586,7 @@ fi fi fi @@ -63,15 +63,15 @@ if [ "$noperlpath" = "" ]; then echo "Inserting path to perl into scripts.." (find "$wadir" -name '*.cgi' -print ; find "$wadir" -name '*.pl' -print) | $perl "$wadir/perlpath.pl" $perl - -@@ -604,7 +596,6 @@ fi - echo "Creating start and stop scripts.." - rm -f $config_dir/stop $config_dir/start $config_dir/restart $config_dir/reload - echo "#!/bin/sh" >>$config_dir/start --echo "echo Starting Webmin server in $wadir" >>$config_dir/start - echo "trap '' 1" >>$config_dir/start - echo "LANG=" >>$config_dir/start - echo "export LANG" >>$config_dir/start -@@ -763,6 +754,7 @@ if [ "$?" != "0" ]; then +@@ -607,7 +599,6 @@ echo "#!/bin/sh" >>$config_dir/.start-init + echo "Creating start and stop init scripts.." + # Start main + echo "#!/bin/sh" >>$config_dir/.start-init +-echo "echo Starting Webmin server in $wadir" >>$config_dir/.start-init + echo "trap '' 1" >>$config_dir/.start-init + echo "LANG=" >>$config_dir/.start-init + echo "export LANG" >>$config_dir/.start-init +@@ -827,6 +818,7 @@ fi echo passdelay=1 >> $config_dir/miniserv.conf fi @@ -79,7 +79,7 @@ if [ "$nouninstall" = "" ]; then echo "Creating uninstall script $config_dir/uninstall.sh .." cat >$config_dir/uninstall.sh <