diff options
Diffstat (limited to '')
| -rw-r--r-- | sysutils/webmin/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/webmin/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/webmin/files/patch-setup.sh | 41 | ||||
| -rw-r--r-- | sysutils/webmin/pkg-plist | 15 |
4 files changed, 48 insertions, 16 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index dca7f97736bc..28451907ada8 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -1,5 +1,5 @@ PORTNAME= webmin -PORTVERSION= 2.402 +PORTVERSION= 2.500 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index c45abd5bcd81..1594e331c501 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750225206 -SHA256 (webmin-2.402.tar.gz) = ced99a948411e255549f4ce8b730820387a50379d755e802ff90ef6ae5deaca5 -SIZE (webmin-2.402.tar.gz) = 38515900 +TIMESTAMP = 1757117581 +SHA256 (webmin-2.500.tar.gz) = aa6b898be7b21847e9cf9bdddb1f13d93b2ccc7dca604b2478f4683641669759 +SIZE (webmin-2.500.tar.gz) = 38527403 diff --git a/sysutils/webmin/files/patch-setup.sh b/sysutils/webmin/files/patch-setup.sh index 4126d48f2bd9..b7acc29be455 100644 --- a/sysutils/webmin/files/patch-setup.sh +++ b/sysutils/webmin/files/patch-setup.sh @@ -14,7 +14,7 @@ cd `dirname $0` if [ -x /bin/pwd ]; then wadir=`/bin/pwd` -@@ -113,7 +120,7 @@ +@@ -113,15 +120,16 @@ echo "" envetcdir="$config_dir" if [ "$envetcdir" = "" ]; then @@ -23,8 +23,10 @@ envetcdirnotfound=1 fi printf "Config file directory [$envetcdir]: " -@@ -121,7 +128,7 @@ - read config_dir + if [ "$config_dir" = "" ]; then +- read config_dir ++ config_dir="$envetcdir" ++ echo "$envetcdir" fi if [ "$config_dir" = "" ]; then - config_dir=/etc/webmin @@ -32,7 +34,7 @@ fi abspath=`echo $config_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -232,7 +239,7 @@ +@@ -232,7 +240,7 @@ else # Config directory exists .. make sure it is not in use ls $config_dir | grep -v rpmsave >/dev/null 2>&1 @@ -41,7 +43,7 @@ echo "ERROR: Config directory $config_dir is not empty" echo "" exit 2 -@@ -241,7 +248,7 @@ +@@ -241,15 +249,16 @@ # Ask for log directory envvardir="$var_dir" if [ "$envvardir" = "" ]; then @@ -50,8 +52,10 @@ envvardirnotfound=1 fi printf "Log file directory [$envvardir]: " -@@ -249,7 +256,7 @@ - read var_dir + if [ "$var_dir" = "" ]; then +- read var_dir ++ var_dir="$envvardir" ++ echo "$envvardir" fi if [ "$var_dir" = "" ]; then - var_dir=/var/webmin @@ -59,3 +63,26 @@ fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then +@@ -290,7 +299,8 @@ + if [ "$perl" = "" ]; then + if [ "$perldef" = "" ]; then + printf "Full path to perl: " +- read perl ++ perl="%%PERL%%" ++ echo "$perl" + if [ "$perl" = "" ]; then + echo "ERROR: No path entered!" + echo "" +@@ -298,10 +308,8 @@ + fi + else + printf "Full path to perl (default $perldef): " +- read perl +- if [ "$perl" = "" ]; then +- perl=$perldef +- fi ++ perl=$perldef ++ echo "$perldef" + fi + fi + echo "" diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist index 1a8fd74b32ba..f41930766f5f 100644 --- a/sysutils/webmin/pkg-plist +++ b/sysutils/webmin/pkg-plist @@ -950,6 +950,7 @@ lib/webmin/authentic-theme/extensions/csf/csf-lib.pl lib/webmin/authentic-theme/extensions/csf/csf.min.css lib/webmin/authentic-theme/extensions/csf/csf.min.css.gz lib/webmin/authentic-theme/extensions/csf/csf.min.js +lib/webmin/authentic-theme/extensions/csf/csf.min.js.LEGAL.txt lib/webmin/authentic-theme/extensions/csf/csf.min.js.gz lib/webmin/authentic-theme/extensions/file-manager/acls.cgi lib/webmin/authentic-theme/extensions/file-manager/bookmark.cgi @@ -969,8 +970,10 @@ lib/webmin/authentic-theme/extensions/file-manager/extract.cgi lib/webmin/authentic-theme/extensions/file-manager/fetcher.cgi lib/webmin/authentic-theme/extensions/file-manager/file-manager-lib.pl lib/webmin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js +lib/webmin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js.LEGAL.txt lib/webmin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js.gz lib/webmin/authentic-theme/extensions/file-manager/file-manager.min.js +lib/webmin/authentic-theme/extensions/file-manager/file-manager.min.js.LEGAL.txt lib/webmin/authentic-theme/extensions/file-manager/file-manager.min.js.gz lib/webmin/authentic-theme/extensions/file-manager/gpg.cgi lib/webmin/authentic-theme/extensions/file-manager/http_download.cgi @@ -986,12 +989,14 @@ lib/webmin/authentic-theme/extensions/mail/mail-lib.pl lib/webmin/authentic-theme/extensions/mail/mail.min.css lib/webmin/authentic-theme/extensions/mail/mail.min.css.gz lib/webmin/authentic-theme/extensions/mail/mail.min.js +lib/webmin/authentic-theme/extensions/mail/mail.min.js.LEGAL.txt lib/webmin/authentic-theme/extensions/mail/mail.min.js.gz lib/webmin/authentic-theme/extensions/mail/mail.src.js lib/webmin/authentic-theme/extensions/mail/message.cgi lib/webmin/authentic-theme/extensions/mail/messages.cgi lib/webmin/authentic-theme/extensions/mail/search.cgi lib/webmin/authentic-theme/extensions/sql.min.js +lib/webmin/authentic-theme/extensions/sql.min.js.LEGAL.txt lib/webmin/authentic-theme/extensions/sql.min.js.gz lib/webmin/authentic-theme/extensions/stats/stats.min.css lib/webmin/authentic-theme/extensions/stats/stats.min.js @@ -1158,6 +1163,7 @@ lib/webmin/authentic-theme/images/modules/bind8/slaves.gif lib/webmin/authentic-theme/images/modules/bind8/soa.gif lib/webmin/authentic-theme/images/modules/bind8/stub.gif lib/webmin/authentic-theme/images/modules/bind8/text.gif +lib/webmin/authentic-theme/images/modules/bind8/tls.gif lib/webmin/authentic-theme/images/modules/bind8/view.gif lib/webmin/authentic-theme/images/modules/bind8/whois.gif lib/webmin/authentic-theme/images/modules/bind8/zonedef.gif @@ -8261,6 +8267,7 @@ lib/webmin/firewalld/config.info.de lib/webmin/firewalld/config.info.fr lib/webmin/firewalld/config.info.no lib/webmin/firewalld/config.info.pl +lib/webmin/firewalld/config_info.pl lib/webmin/firewalld/create_zone.cgi lib/webmin/firewalld/default_zone.cgi lib/webmin/firewalld/delete_rules.cgi @@ -13474,7 +13481,8 @@ lib/webmin/mysql/config-aix lib/webmin/mysql/config-cobalt-linux lib/webmin/mysql/config-coherent-linux lib/webmin/mysql/config-debian-linux -lib/webmin/mysql/config-debian-linux-10.0-ALL +lib/webmin/mysql/config-debian-linux-10.0-12.0 +lib/webmin/mysql/config-debian-linux-13.0-ALL lib/webmin/mysql/config-debian-linux-2.2-9.0 lib/webmin/mysql/config-freebsd lib/webmin/mysql/config-freebsd-8-ALL @@ -19854,7 +19862,6 @@ lib/webmin/status/alive-monitor.pl lib/webmin/status/apache-monitor.pl lib/webmin/status/backup_config.pl lib/webmin/status/bind8-monitor.pl -lib/webmin/status/cfengine-monitor.pl lib/webmin/status/cgi_args.pl lib/webmin/status/change-monitor.pl lib/webmin/status/config @@ -19893,7 +19900,6 @@ lib/webmin/status/delete_mons.cgi lib/webmin/status/delete_tmpls.cgi lib/webmin/status/dhcpd-monitor.pl lib/webmin/status/dns-monitor.pl -lib/webmin/status/dnsadmin-monitor.pl lib/webmin/status/dovecot-monitor.pl lib/webmin/status/du-monitor.pl lib/webmin/status/edit_mon.cgi @@ -19920,7 +19926,6 @@ lib/webmin/status/imap-monitor.pl lib/webmin/status/index.cgi lib/webmin/status/inetd-monitor.pl lib/webmin/status/init-monitor.pl -lib/webmin/status/jabber-monitor.pl lib/webmin/status/lang/ar.auto lib/webmin/status/lang/bg.auto lib/webmin/status/lang/ca @@ -20043,8 +20048,8 @@ lib/webmin/status/mon-monitor.pl lib/webmin/status/monitor.pl lib/webmin/status/mysql-monitor.pl lib/webmin/status/nfs-monitor.pl -lib/webmin/status/nut-monitor.pl lib/webmin/status/oldfile-monitor.pl +lib/webmin/status/phpini-monitor.pl lib/webmin/status/ping-monitor.pl lib/webmin/status/portsentry-monitor.pl lib/webmin/status/postfix-monitor.pl |