From owner-svn-ports-head@freebsd.org Tue Mar 9 15:07:02 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1B0A5554F41; Tue, 9 Mar 2021 15:07:02 +0000 (UTC) (envelope-from olgeni@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 4Dvz860Fm8z4XXk; Tue, 9 Mar 2021 15:07:02 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EB7381E494; Tue, 9 Mar 2021 15:07:01 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 129F71Dj051583; Tue, 9 Mar 2021 15:07:01 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 129F71tI051578; Tue, 9 Mar 2021 15:07:01 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <202103091507.129F71tI051578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Tue, 9 Mar 2021 15:07:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567935 - in head/sysutils/webmin: . files X-SVN-Group: ports-head X-SVN-Commit-Author: olgeni X-SVN-Commit-Paths: in head/sysutils/webmin: . files X-SVN-Commit-Revision: 567935 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Mar 2021 15:07:02 -0000 Author: olgeni Date: Tue Mar 9 15:07:00 2021 New Revision: 567935 URL: https://svnweb.freebsd.org/changeset/ports/567935 Log: Update sysutils/webmin to version 1.973. Modified: head/sysutils/webmin/Makefile head/sysutils/webmin/distinfo head/sysutils/webmin/files/patch-setup.sh head/sysutils/webmin/pkg-plist Modified: head/sysutils/webmin/Makefile ============================================================================== --- head/sysutils/webmin/Makefile Tue Mar 9 14:13:47 2021 (r567934) +++ head/sysutils/webmin/Makefile Tue Mar 9 15:07:00 2021 (r567935) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= webmin -PORTVERSION= 1.970 +PORTVERSION= 1.973 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf Modified: head/sysutils/webmin/distinfo ============================================================================== --- head/sysutils/webmin/distinfo Tue Mar 9 14:13:47 2021 (r567934) +++ head/sysutils/webmin/distinfo Tue Mar 9 15:07:00 2021 (r567935) @@ -1,3 +1,3 @@ -TIMESTAMP = 1610880555 -SHA256 (webmin-1.970.tar.gz) = 6798027c7230be1adf6cf2fd27a74185718abcb0e1ff8b674a518b41e885651e -SIZE (webmin-1.970.tar.gz) = 47312887 +TIMESTAMP = 1615282799 +SHA256 (webmin-1.973.tar.gz) = 1913836c76ef4f38d7ffc997f26039b0fbb170126264077bacd3d76e4731c6b0 +SIZE (webmin-1.973.tar.gz) = 45258810 Modified: head/sysutils/webmin/files/patch-setup.sh ============================================================================== --- head/sysutils/webmin/files/patch-setup.sh Tue Mar 9 14:13:47 2021 (r567934) +++ head/sysutils/webmin/files/patch-setup.sh Tue Mar 9 15:07:00 2021 (r567935) @@ -1,26 +1,6 @@ ---- setup.sh.orig 2020-07-01 17:46:39 UTC +--- setup.sh.orig 2021-03-07 18:10:32 UTC +++ setup.sh -@@ -17,17 +17,9 @@ fi - srcdir=$wadir - ver=`cat "$wadir/version"` - --# Find temp directory --if [ "$tempdir" = "" ]; then -- tempdir=/tmp/.webmin --fi -+tempdir=/tmp/.webmin -+mkdir -p $tempdir - --if [ $? != "0" ]; then -- echo "ERROR: Cannot find the Webmin install directory"; -- echo ""; -- exit 1; --fi -- - echo "***********************************************************************" - echo "* Welcome to the Webmin setup script, version $ver *" - echo "***********************************************************************" -@@ -98,19 +90,7 @@ echo "Webmin uses separate directories for configurati +@@ -102,19 +102,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 "" @@ -41,7 +21,7 @@ if [ ! -d $config_dir ]; then mkdir $config_dir; if [ $? != 0 ]; then -@@ -210,12 +190,12 @@ else +@@ -209,12 +197,12 @@ else fi # Ask for log directory @@ -56,7 +36,7 @@ fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -243,7 +223,9 @@ else +@@ -242,7 +230,9 @@ else echo "Webmin is written entirely in Perl. Please enter the full path to the" echo "Perl 5 interpreter on your system." echo "" @@ -67,7 +47,7 @@ perldef=/usr/bin/perl elif [ -x /usr/local/bin/perl ]; then perldef=/usr/local/bin/perl -@@ -444,6 +426,7 @@ else +@@ -443,6 +433,7 @@ else fi fi @@ -75,7 +55,7 @@ # Ask whether to run at boot time if [ "$atboot" = "" ]; then if echo "$os_type" | grep -q "\-linux$"; then -@@ -593,6 +576,7 @@ EOF +@@ -594,6 +585,7 @@ EOF fi fi @@ -83,7 +63,7 @@ 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 - -@@ -603,7 +587,6 @@ fi +@@ -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 @@ -91,7 +71,7 @@ echo "trap '' 1" >>$config_dir/start echo "LANG=" >>$config_dir/start echo "export LANG" >>$config_dir/start -@@ -754,6 +737,7 @@ if [ "$?" != "0" ]; then +@@ -763,6 +754,7 @@ if [ "$?" != "0" ]; then echo passdelay=1 >> $config_dir/miniserv.conf fi @@ -99,7 +79,7 @@ if [ "$nouninstall" = "" ]; then echo "Creating uninstall script $config_dir/uninstall.sh .." cat >$config_dir/uninstall.sh <