From nobody Wed Jul 06 13:50:14 2022 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 BE9591D1A8DD; Wed, 6 Jul 2022 13:50:14 +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 4LdLX64fc1z4YQy; Wed, 6 Jul 2022 13:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657115414; 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=e1Y0OemAPngl08uouN7dE6OzSb7xx9+SfVWXidINlvw=; b=imuMUnCHfVoC2GcR/yo/LxeBbYKHmpa1p3z64jQaeiut4IANQTOzTF14XTJiF+qa+nRwkd SASdZDoojNkcdt7IJLajw/cOxBD5NQ870tTctmjFsE0gK3iGkyUhQlrdtt2XmSEWJqqIuO Uoll5VvvHQqU+sQe8M8EvuJIYVxXa5VniC5WhQgjSa7g9WoxJgkgcRpplda1sra2eLK9GJ uoHE4PH250pNUqvpm5X+0c2elHx0NAl2jNUESSixw/Qr0yVtqPazEA+NAGY4xEYZbQZaQK ETk4tl0lbOhEUOdu1MLUDnaUHeGk/LZJPZ4qQ7oRPJ8oCVs7GAyOZ7Sd5DIVyQ== 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 7F1271B824; Wed, 6 Jul 2022 13:50:14 +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 266DoEgg017657; Wed, 6 Jul 2022 13:50:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266DoEjR017629; Wed, 6 Jul 2022 13:50:14 GMT (envelope-from git) Date: Wed, 6 Jul 2022 13:50:14 GMT Message-Id: <202207061350.266DoEjR017629@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jimmy Olgeni Subject: git: 80a6f03c9086 - main - sysutils/webmin: update to version 1.996 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olgeni X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80a6f03c9086cd90e441d12e4d712f9dadaeaa7d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657115414; 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=e1Y0OemAPngl08uouN7dE6OzSb7xx9+SfVWXidINlvw=; b=VUFK9nmqT42vaxLvnlQF4meAE/xNlPPKWY1Tc69pCrRNw0pRKcblc5p5sddhBrpAPHZM6B DZ+IXAvs2Yfo1/Pg+FfLZz9S5rvH2vS/77NfhFMqKgvOEGIh8KLMJm5NE++MoEmmq6f7Or fwvvLD9jyDzDKxqUqReyu6T3tvyqnF7/0xe85RkDQ2kPbzcMYZKKCzvJyiNyeHDHkW5cbP JOafp2bxr93qiT/apacu1NJObc8W6hVU7fAAXELg6jjGxVHTL57uikaAf3lie50Ii763QA rBFYp3usAPZWcTBho2g9LRUp1iB7OCO9BRS+j74Qu89EU6bBZo0dwoC/LFl1Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657115414; a=rsa-sha256; cv=none; b=DAp+9xbGY3SIcXrIS/FF8J7INIyvG9BF8e2EYce1mINZtWdvGdq7K/Op2XMh4TbcEuEkKC N182ZmO7Cz8oAQXCH+QDCcu9oN5ZFspF7PymylaWBTVZNm1RZGVsUzHBNHPfW0HBm+dmSx rgQag+mkijiZTSbBwXlZhy/rIDeFvFZeJjxHwtR9AJdRM83V6HnAsbbl+zP7GYXSmyBkih wR5NHI9dKu4kMuPTBmqdEGIke0l1nJk2wIz5yWcJRkDbNUDOwNrUzm+CjXqC9BsXpjXtk4 FPyJl0JWdNCxaLkVAVLXZBEHUypON+nSy2LvafeGe4/UPy4brX8WuXZEfKtjAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olgeni: URL: https://cgit.FreeBSD.org/ports/commit/?id=80a6f03c9086cd90e441d12e4d712f9dadaeaa7d commit 80a6f03c9086cd90e441d12e4d712f9dadaeaa7d Author: Jimmy Olgeni AuthorDate: 2022-06-27 09:11:43 +0000 Commit: Jimmy Olgeni CommitDate: 2022-07-06 13:50:07 +0000 sysutils/webmin: update to version 1.996 --- sysutils/webmin/Makefile | 2 +- sysutils/webmin/distinfo | 6 ++-- sysutils/webmin/files/patch-setup.sh | 24 ++++++------- sysutils/webmin/pkg-plist | 65 ++++++++++++++++++++++++------------ 4 files changed, 60 insertions(+), 37 deletions(-) diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index 7609a3b70732..65487f0e1419 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -1,7 +1,7 @@ # Created by: Andreas Klemm PORTNAME= webmin -PORTVERSION= 1.994 +PORTVERSION= 1.996 PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index 658d35132ded..c36a71c56026 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653891865 -SHA256 (webmin-1.994.tar.gz) = aee5ae6d73d6fb4904f03215efa8aa485e27fbf65b13aca726a8ab9723fea0ee -SIZE (webmin-1.994.tar.gz) = 44691491 +TIMESTAMP = 1657104952 +SHA256 (webmin-1.996.tar.gz) = 9d60b449f3cd439acc513c4293274d26e6ca1fb6dbeeb9eca538f9d820072c53 +SIZE (webmin-1.996.tar.gz) = 44725939 diff --git a/sysutils/webmin/files/patch-setup.sh b/sysutils/webmin/files/patch-setup.sh index 293144685590..17804bd1a726 100644 --- a/sysutils/webmin/files/patch-setup.sh +++ b/sysutils/webmin/files/patch-setup.sh @@ -1,6 +1,6 @@ ---- setup.sh.orig 2022-05-23 20:33:54 UTC +--- setup.sh.orig 2022-07-04 19:10:33 UTC +++ setup.sh -@@ -103,19 +103,7 @@ echo "" +@@ -105,19 +105,7 @@ echo "Webmin uses separate directories for configurati 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 -@@ -210,12 +198,12 @@ else +@@ -212,12 +200,12 @@ else fi # Ask for log directory @@ -36,7 +36,7 @@ fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -243,7 +231,9 @@ else +@@ -245,7 +233,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 -@@ -444,6 +434,7 @@ else +@@ -446,6 +436,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 -@@ -595,6 +586,7 @@ fi +@@ -607,6 +598,7 @@ EOF 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 - -@@ -607,7 +599,6 @@ echo "#!/bin/sh" >>$config_dir/.start-init +@@ -618,7 +610,6 @@ fi echo "Creating start and stop init scripts.." # Start main - echo "#!/bin/sh" >>$config_dir/.start-init + 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 +@@ -849,6 +840,7 @@ if [ "$?" != "0" ]; then 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 <