From owner-svn-ports-all@freebsd.org Thu Jul 2 13:36:07 2020 Return-Path: Delivered-To: svn-ports-all@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 82AEE3569F4; Thu, 2 Jul 2020 13:36:07 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49yJyb3DKRz3bDS; Thu, 2 Jul 2020 13:36:07 +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 392341B177; Thu, 2 Jul 2020 13:36:07 +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 062Da7jw011571; Thu, 2 Jul 2020 13:36:07 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 062Da6Y2011565; Thu, 2 Jul 2020 13:36:06 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <202007021336.062Da6Y2011565@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Thu, 2 Jul 2020 13:36:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541037 - 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: 541037 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2020 13:36:07 -0000 Author: olgeni Date: Thu Jul 2 13:36:06 2020 New Revision: 541037 URL: https://svnweb.freebsd.org/changeset/ports/541037 Log: Update sysutils/webmin to version 1.950. Modified: head/sysutils/webmin/Makefile head/sysutils/webmin/distinfo head/sysutils/webmin/files/patch-setup.sh (contents, props changed) head/sysutils/webmin/pkg-plist Modified: head/sysutils/webmin/Makefile ============================================================================== --- head/sysutils/webmin/Makefile Thu Jul 2 13:35:18 2020 (r541036) +++ head/sysutils/webmin/Makefile Thu Jul 2 13:36:06 2020 (r541037) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= webmin -PORTVERSION= 1.941 +PORTVERSION= 1.950 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf Modified: head/sysutils/webmin/distinfo ============================================================================== --- head/sysutils/webmin/distinfo Thu Jul 2 13:35:18 2020 (r541036) +++ head/sysutils/webmin/distinfo Thu Jul 2 13:36:06 2020 (r541037) @@ -1,3 +1,3 @@ -TIMESTAMP = 1579090140 -SHA256 (webmin-1.941.tar.gz) = 3a19228d92556c7722c6fe56c9d4b73d477a19845b0dae3f018fc7fc0306b29a -SIZE (webmin-1.941.tar.gz) = 31045591 +TIMESTAMP = 1593678751 +SHA256 (webmin-1.950.tar.gz) = 128aaca2cee95d688be97ad1ee08523e3bc54a2d5c70f97f9252dfb8f00daa20 +SIZE (webmin-1.950.tar.gz) = 46902205 Modified: head/sysutils/webmin/files/patch-setup.sh ============================================================================== --- head/sysutils/webmin/files/patch-setup.sh Thu Jul 2 13:35:18 2020 (r541036) +++ head/sysutils/webmin/files/patch-setup.sh Thu Jul 2 13:36:06 2020 (r541037) @@ -1,6 +1,6 @@ ---- setup.sh.orig 2015-03-13 23:51:36 UTC +--- setup.sh.orig 2020-07-01 17:46:39 UTC +++ setup.sh -@@ -17,16 +17,8 @@ +@@ -17,17 +17,9 @@ fi srcdir=$wadir ver=`cat "$wadir/version"` @@ -8,18 +8,19 @@ -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 -+tempdir=/tmp/.webmin -+mkdir -p $tempdir - +- echo "***********************************************************************" echo "* Welcome to the Webmin setup script, version $ver *" -@@ -97,19 +89,7 @@ + echo "***********************************************************************" +@@ -98,19 +90,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 "" @@ -40,7 +41,7 @@ if [ ! -d $config_dir ]; then mkdir $config_dir; if [ $? != 0 ]; then -@@ -209,12 +189,12 @@ +@@ -210,12 +190,12 @@ else fi # Ask for log directory @@ -55,7 +56,7 @@ fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -242,7 +222,9 @@ +@@ -243,7 +223,9 @@ else echo "Webmin is written entirely in Perl. Please enter the full path to the" echo "Perl 5 interpreter on your system." echo "" @@ -66,30 +67,15 @@ perldef=/usr/bin/perl elif [ -x /usr/local/bin/perl ]; then perldef=/usr/local/bin/perl -@@ -441,22 +423,6 @@ +@@ -444,6 +426,7 @@ else fi fi -- # Ask whether to run at boot time -- if [ "$atboot" = "" ]; then -- initsupp=`grep "^os_support=" "$srcdir/init/module.info" | sed -e 's/os_support=//g' | grep $os_type` -- atboot=0 -- if [ "$initsupp" != "" ]; then -- printf "Start Webmin at boot time (y/n): " -- read atbootyn -- if [ "$atbootyn" = "y" -o "$atbootyn" = "Y" ]; then -- atboot=1 -- makeboot=1 -- fi -- else -- echo "Webmin does not support being started at boot time on your system." -- fi -- fi -- - # Copy files to target directory - echo "***********************************************************************" - if [ "$wadir" != "$srcdir" ]; then -@@ -578,6 +544,7 @@ ++ atboot=0 + # Ask whether to run at boot time + if [ "$atboot" = "" ]; then + if echo "$os_type" | grep -q "\-linux$"; then +@@ -593,6 +576,7 @@ EOF fi fi @@ -97,7 +83,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 - -@@ -588,7 +555,6 @@ +@@ -603,7 +587,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 @@ -105,7 +91,7 @@ echo "trap '' 1" >>$config_dir/start echo "LANG=" >>$config_dir/start echo "export LANG" >>$config_dir/start -@@ -724,6 +690,7 @@ +@@ -754,6 +737,7 @@ if [ "$?" != "0" ]; then echo passdelay=1 >> $config_dir/miniserv.conf fi @@ -113,7 +99,7 @@ if [ "$nouninstall" = "" ]; then echo "Creating uninstall script $config_dir/uninstall.sh .." cat >$config_dir/uninstall.sh <