From nobody Sat Oct 01 08:37:52 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 4MfgTY1ylxz4d5pC; Sat, 1 Oct 2022 08:37:53 +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 4MfgTY1Mmsz3RWD; Sat, 1 Oct 2022 08:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664613473; 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=XqWPZouK79leLNvNSgyb10MQZ3jiy0bx3CjFPoxZoos=; b=SEUBHmzu6m4UfWMgGdr/2x0z+SyHIQub2WKUd7+ANAdlj46lsUTwturrV3xeLBig6Gnbj+ 4B0lcwoFGq/5NiXiWLSqbFZCRSHV8SJzXhRqwxzAmqo5GnNDmhqLzQnBXHFFWXMFmbge32 PeTf+22nPjqOpc6/tllr5ZZMQj2ft3ntU2/8UdduP/Vu7d/iJ+STGdR3OtXZizwjkLjNLU 988Oo4irFVGGJjNE4aim4JJtGdPVRXfvv0JCv7gxlbtHbR9fPK12q9NG+DoHnXI0AieSiN HTyHQl625fiW4kHTzcP8k6mMrrv5cAVzbLDopBdyG9wAjDsrHwqL9TJKyiG/bw== 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 4MfgTY0H5qzStf; Sat, 1 Oct 2022 08:37:53 +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 2918bqxH077219; Sat, 1 Oct 2022 08:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2918bqLD077218; Sat, 1 Oct 2022 08:37:52 GMT (envelope-from git) Date: Sat, 1 Oct 2022 08:37:52 GMT Message-Id: <202210010837.2918bqLD077218@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: 5725ea1ced84 - main - sysutils/webmin: update to version 2.000 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: 5725ea1ced84beca8f9eb0481bc61d6af7214373 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664613473; 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=XqWPZouK79leLNvNSgyb10MQZ3jiy0bx3CjFPoxZoos=; b=jsvqUx0oFHAC1axl85cW8Q91qdPo6Bn0MbxPNlmppndojNBwHXo2oB8mp7gFmhqm4maOOC nWX6V4ejvDhMCiKyH0ZoAkvCQ/W7GrQdlJ7ThPid+Y8yGoq2gcYBmD5P/gM+0NS0UbMlRL pPVuMqfGBqWg9THnkgyfKO6yR/xjGm33/Cmnca+7ADdSDQFb23cD9JriUst1Jr8J1luhJk Ok/PJw1GaiikXGRjUOpIzeqciTXUTCz1evtFlE0DqLQGiUsDGoBUGfClMS40JjVAXjZ93w C0G6KcRQpIAv4YeRNTzLK+Ki3Q1shE0L/oEo05c6mInSH31D3KBe26IFFb1s+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664613473; a=rsa-sha256; cv=none; b=JfAhO4Bb3rKjTvMURJvhorzLqcz0QjZl2i9a5Lly/TSI607tM1/BsFkStQspu8zR70D1VH V0OEPWA3lpw+4qHGApVapCQD6EfaCamFHnItNYbzuhwqp1bS+IY9WpLN3CGhQtyzhUz3rH fPC3Fx0Y47VSDgkxKBGDT0pQElKjAQrh7bRglbnRYoi3SoIZyYeKQAYXbKnRiX9GIpxtV8 rBWiGLlUpGykGhYdFfAgOoRuKrP92aRXjbsk/4sdeUiWsCBjbNZoLV+/UF1GN+QwBmhquE W4nHtj9ozSk1p6/StyMp1emwEdLrUFi9W5HGpIDDum3XbTNMC1pzf6sh1+Ew4w== 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=5725ea1ced84beca8f9eb0481bc61d6af7214373 commit 5725ea1ced84beca8f9eb0481bc61d6af7214373 Author: Jimmy Olgeni AuthorDate: 2022-10-01 08:15:05 +0000 Commit: Jimmy Olgeni CommitDate: 2022-10-01 08:34:28 +0000 sysutils/webmin: update to version 2.000 --- sysutils/webmin/Makefile | 6 +- sysutils/webmin/distinfo | 6 +- sysutils/webmin/files/patch-setup.sh | 159 +++++++++++++++++------------------ sysutils/webmin/pkg-plist | 128 +++++++++++++++++++++++----- 4 files changed, 192 insertions(+), 107 deletions(-) diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index 5e03ecd6706d..30efa19bdcfb 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -1,5 +1,5 @@ PORTNAME= webmin -PORTVERSION= 1.997 +PORTVERSION= 2.000 PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ @@ -43,7 +43,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/setup.sh - @${FIND} ${WRKSRC} \( -type f -and \( -name config-freebsd\* -or -name config \) \) \ + @${FIND} ${WRKSRC} \( -type f -and \( -name config-freebsd\* -or -name config -or -name setup.sh \) \) \ -exec ${REINPLACE_CMD} -e "s@/usr/local@${PREFIX}@g" {} \; \ -exec ${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" {} \; @@ -52,8 +52,6 @@ post-patch: @${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" -or -name "*.pyc" \) -delete - @${PRINTF} "g/^FreeBSD/m0\nwq\n" | ex ${WRKSRC}/os_list.txt - do-build: @${PYTHON_CMD} -mcompileall ${WRKSRC}/ajaxterm/ajaxterm/ @${PYTHON_CMD} -O -mcompileall ${WRKSRC}/ajaxterm/ajaxterm/ diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index 1722bcaf9aba..42fd089515f1 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659360089 -SHA256 (webmin-1.997.tar.gz) = a7591eef4daa3e65de529dd21cdbbb97e53e7daf5a6aa446c3d7298a1fc717fd -SIZE (webmin-1.997.tar.gz) = 44723213 +TIMESTAMP = 1664549814 +SHA256 (webmin-2.000.tar.gz) = b7394544543262ab9c614266cf85cc634fd083e2a32b4fb981bcbf0fc53f2aab +SIZE (webmin-2.000.tar.gz) = 44822732 diff --git a/sysutils/webmin/files/patch-setup.sh b/sysutils/webmin/files/patch-setup.sh index 17804bd1a726..4146f59d0404 100644 --- a/sysutils/webmin/files/patch-setup.sh +++ b/sysutils/webmin/files/patch-setup.sh @@ -1,97 +1,94 @@ ---- setup.sh.orig 2022-07-04 19:10:33 UTC +--- setup.sh.orig 2022-10-01 06:55:59 UTC +++ setup.sh -@@ -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." +@@ -13,6 +13,13 @@ if [ "$bootscript" = "" ]; then + bootscript="webmin" + fi + ++nostart="yes" ++nostop="yes" ++nochown="yes" ++nouninstall="yes" ++noperlpath="yes" ++atboot=0 ++ + cd `dirname $0` + if [ -x /bin/pwd ]; then + wadir=`/bin/pwd` +@@ -112,7 +119,7 @@ echo "you can just accept the defaults." echo "" --printf "Config file directory [/etc/webmin]: " --if [ "$config_dir" = "" ]; then -- read config_dir --fi --if [ "$config_dir" = "" ]; then + envetcdir="$config_dir" + if [ "$envetcdir" = "" ]; then +- envetcdir=/etc/webmin ++ envetcdir=%%PREFIX%%/etc/webmin + envetcdirnotfound=1 + fi + printf "Config file directory [$envetcdir]: " +@@ -120,7 +127,7 @@ if [ "$config_dir" = "" ]; then + read config_dir + fi + if [ "$config_dir" = "" ]; then - config_dir=/etc/webmin --fi --abspath=`echo $config_dir | grep "^/"` --if [ "$abspath" = "" ]; then -- echo "Config directory must be an absolute path" -- echo "" -- exit 2 --fi -+config_dir=/usr/local/etc/webmin - if [ ! -d $config_dir ]; then - mkdir $config_dir; - if [ $? != 0 ]; then -@@ -212,12 +200,12 @@ else ++ config_dir=%%PREFIX%%/etc/webmin + fi + abspath=`echo $config_dir | grep "^/"` + if [ "$abspath" = "" ]; then +@@ -214,7 +221,7 @@ if [ "$upgrading" = 1 ]; then + if [ $? != "0" ]; then + echo "logout=$config_dir/logout-flag" >> $config_dir/miniserv.conf fi - +- ++ + # Check for third-party modules in old version + if [ "$wadir" != "$oldwadir" ]; then + echo "Checking for third-party modules .." +@@ -231,7 +238,7 @@ if [ "$upgrading" = 1 ]; then + else + # Config directory exists .. make sure it is not in use + ls $config_dir | grep -v rpmsave >/dev/null 2>&1 +- if [ "$?" = "0" -a "$config_dir" != "/etc/webmin" ]; then ++ if [ "$?" = "0" -a "$config_dir" != "%%PREFIX%%/etc/webmin" ]; then + echo "ERROR: Config directory $config_dir is not empty" + echo "" + exit 2 +@@ -240,7 +247,7 @@ else # Ask for log directory -- printf "Log file directory [/var/webmin]: " -+ printf "Log file directory [/var/log/webmin]: " - if [ "$var_dir" = "" ]; then + envvardir="$var_dir" + if [ "$envvardir" = "" ]; then +- envvardir=/var/webmin ++ envvardir=/var/db/webmin + envvardirnotfound=1 + fi + printf "Log file directory [$envvardir]: " +@@ -248,7 +255,7 @@ else read var_dir fi if [ "$var_dir" = "" ]; then - var_dir=/var/webmin -+ var_dir=/var/log/webmin ++ var_dir=/var/db/webmin fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -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 "" -- if [ -x /usr/bin/perl ]; then -+ if [ -x %%PERL%% ]; then -+ perldef=%%PERL%% -+ elif [ -x /usr/bin/perl ]; then - perldef=/usr/bin/perl - elif [ -x /usr/local/bin/perl ]; then - perldef=/usr/local/bin/perl -@@ -446,6 +436,7 @@ else - fi - fi - -+ atboot=0 - # Ask whether to run at boot time - if [ "$atboot" = "" ]; then - if echo "$os_type" | grep -q "\-linux$"; then -@@ -607,6 +598,7 @@ EOF +@@ -305,7 +312,7 @@ else fi - fi + echo "" -+noperlpath="yes" - 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 - -@@ -618,7 +610,6 @@ fi - 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 -@@ -849,6 +840,7 @@ if [ "$?" != "0" ]; then - echo passdelay=1 >> $config_dir/miniserv.conf - fi +- # Test perl ++ # Test perl + echo "Testing Perl .." + if [ ! -x $perl ]; then + echo "ERROR: Failed to find perl at $perl" +@@ -780,7 +787,7 @@ if [ -x "$systemctlcmd" ]; then -+nouninstall="yes" - if [ "$nouninstall" = "" ]; then - echo "Creating uninstall script $config_dir/uninstall.sh .." - cat >$config_dir/uninstall.sh <