[pkgsrc/trunk]: pkgsrc Update sysutils/webmin to webmin-1.170. Changes from ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/55d29db1857a
branches:  trunk
changeset: 487984:55d29db1857a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jan 23 04:36:27 2005 +0000

description:
Update sysutils/webmin to webmin-1.170.  Changes from version 1.150
include:

* Added the new Bandwidth Monitoring module, for generating simple
  reports of network traffic by port, time and host on Linux systems.
* Added the Cluster Copy module, for copying files to multiple servers
  either on schedule or manually.
* Added the Backup Configuration Files module, for backing up and
  restoring config files known to Webmin.
* Several improvements to the Linux firewall module, including pre-
  and post commands, cluster support and the ability to reset the
  firewall configuration.
* Support for selecting specific MySQL and PostgreSQL tables to back
  up, and improved searching in the MySQL module.
* Automatic email notification for users approaching their disk quotas.
* The timezone can now be set in the System Time module on Linux,
  Solaris and FreeBSD.
* Added the new Sarg Squid access reporting module. Thanks to Omar
  Armas for sponsoring its development.
* Added support for NFSv4 to the Disk and Network Filesystems module.
* In the MySQL and PostgreSQL modules, all databases can now be backed
  up at once, either manually or on a configured schedule.
* Added the ability to delete multiple users at once to the Users and
  Groups module.
* Added support for MD5 encryption for Webmin passwords, to avoid the
  8-character effective password length limit.
* The BIND module can now create and edit delegation-only zones.
* When PAM is used for Unix authentication, expired passwords are now
  detected and the user is prompted to select a new password (if this
  feature is enabled on the Webmin Configuration module).

diffstat:

 doc/CHANGES                      |   3 ++-
 sysutils/webmin/DEINSTALL        |   4 ++--
 sysutils/webmin/Makefile         |   5 ++---
 sysutils/webmin/distinfo         |   8 ++++----
 sysutils/webmin/files/webmin.sh  |  39 ++++++++++++++-------------------------
 sysutils/webmin/patches/patch-aa |  24 +++++++++++++++++++-----
 6 files changed, 43 insertions(+), 40 deletions(-)

diffs (174 lines):

diff -r 342452bc01cf -r 55d29db1857a doc/CHANGES
--- a/doc/CHANGES       Sun Jan 23 04:09:05 2005 +0000
+++ b/doc/CHANGES       Sun Jan 23 04:36:27 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.8879 2005/01/23 00:24:33 rh Exp $
+$NetBSD: CHANGES,v 1.8880 2005/01/23 04:36:28 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -502,3 +502,4 @@
        Updated socat to 1.4.1.0 [adrianp 2005-01-22]
        Updated smokeping to 1.37 [adrianp 2005-01-22]
        Updated cgoban-java to 2.6.9 [rh 2005-01-23]
+       Updated webmin to 1.170 [jlam 2005-01-23]
diff -r 342452bc01cf -r 55d29db1857a sysutils/webmin/DEINSTALL
--- a/sysutils/webmin/DEINSTALL Sun Jan 23 04:09:05 2005 +0000
+++ b/sysutils/webmin/DEINSTALL Sun Jan 23 04:36:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.2 2004/07/23 19:47:21 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2005/01/23 04:36:27 jlam Exp $
 
 WEBMIN_DIR="@WEBMIN_DIR@"
 WEBMIN_ETCDIR="@WEBMIN_ETCDIR@"
@@ -6,7 +6,7 @@
 case ${STAGE} in
 DEINSTALL)
        uninstall="${WEBMIN_ETCDIR}/uninstall.sh"
-       if [ -x ${uninstall} ]; then
+       if [ -x "${uninstall}" ]; then
                ${ECHO} "y" | ${uninstall}
        fi
        ;;
diff -r 342452bc01cf -r 55d29db1857a sysutils/webmin/Makefile
--- a/sysutils/webmin/Makefile  Sun Jan 23 04:09:05 2005 +0000
+++ b/sysutils/webmin/Makefile  Sun Jan 23 04:36:27 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:50 reed Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/23 04:36:27 jlam Exp $
 
-DISTNAME=      webmin-1.150-minimal
+DISTNAME=      webmin-1.170-minimal
 PKGNAME=       ${DISTNAME:S/-minimal$//}
-PKGREVISION=   1
 CATEGORIES=    sysutils www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=webadmin/}
 
diff -r 342452bc01cf -r 55d29db1857a sysutils/webmin/distinfo
--- a/sysutils/webmin/distinfo  Sun Jan 23 04:09:05 2005 +0000
+++ b/sysutils/webmin/distinfo  Sun Jan 23 04:36:27 2005 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/07/23 19:47:21 jlam Exp $
+$NetBSD: distinfo,v 1.3 2005/01/23 04:36:27 jlam Exp $
 
-SHA1 (webmin-1.150-minimal.tar.gz) = 2bcc9ae2c9dddce70117d0061d5db3faed349019
-Size (webmin-1.150-minimal.tar.gz) = 955826 bytes
-SHA1 (patch-aa) = ea7b6b7d3ce63b273a3ad09127631da51df13946
+SHA1 (webmin-1.170-minimal.tar.gz) = a32ef7e89d669020cb47e13bc40e321e3c4b6aa5
+Size (webmin-1.170-minimal.tar.gz) = 1011002 bytes
+SHA1 (patch-aa) = e732d88ab149ba4e577e6b0aa28884d6bc3b8102
diff -r 342452bc01cf -r 55d29db1857a sysutils/webmin/files/webmin.sh
--- a/sysutils/webmin/files/webmin.sh   Sun Jan 23 04:09:05 2005 +0000
+++ b/sysutils/webmin/files/webmin.sh   Sun Jan 23 04:36:27 2005 +0000
@@ -1,13 +1,12 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: webmin.sh,v 1.1.1.1 2004/07/23 19:28:32 jlam Exp $
+# $NetBSD: webmin.sh,v 1.2 2005/01/23 04:36:27 jlam Exp $
 #
+
 # PROVIDE: webmin
 # REQUIRE: LOGIN
 
-if [ -f /etc/rc.subr ]; then
-       . /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="webmin"
 rcvar=${name}
@@ -16,13 +15,17 @@
 webmin_etcdir="@WEBMIN_ETCDIR@"
 required_files="@WEBMIN_ETCDIR@/miniserv.conf"
 
-start_cmd="webmin_doit"
-stop_cmd="webmin_doit"
+start_cmd="webmin_doit start"
+stop_cmd="webmin_doit stop"
 
 webmin_doit()
 {
-       script="${webmin_etcdir}/${rc_arg}"
-       required_files="${required_files} ${script}"
+       case $1 in
+       start)  script="${webmin_etcdir}/start" ;;
+       stop)   script="${webmin_etcdir}/stop" ;;
+       *)
+       esac
+       required_files="$required_files $script"
        for f in $required_files; do
                if [ ! -r "$f" ]; then
                        @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
@@ -31,22 +34,8 @@
                        fi
                fi
        done
-       ${script}
+       $script
 }
 
-if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
-       load_rc_config $name
-       run_rc_command "$1"
-else
-       if [ -f /etc/rc.conf ]; then
-               . /etc/rc.conf
-       fi
-       case "$1" in
-       stop)
-               eval ${stop_cmd}
-               ;;
-       start)
-               eval ${start_cmd}
-               ;;
-       esac
-fi
+load_rc_config $name
+run_rc_command "$1"
diff -r 342452bc01cf -r 55d29db1857a sysutils/webmin/patches/patch-aa
--- a/sysutils/webmin/patches/patch-aa  Sun Jan 23 04:09:05 2005 +0000
+++ b/sysutils/webmin/patches/patch-aa  Sun Jan 23 04:36:27 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/07/23 19:47:21 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2005/01/23 04:36:27 jlam Exp $
 
---- setup.sh.orig      Wed Jun  2 01:33:09 2004
+--- setup.sh.orig      2004-11-12 23:26:56.000000000 -0500
 +++ setup.sh
-@@ -419,6 +419,7 @@ else
+@@ -425,6 +425,7 @@ else
        fi
  
        # Ask whether to run at boot time
@@ -10,7 +10,7 @@
        if [ "$atboot" = "" ]; then
                initsupp=`grep "^os_support=" "$srcdir/init/module.info" | sed -e 's/os_support=//g' | grep $os_type`
                atboot=0
-@@ -535,6 +536,7 @@ EOF
+@@ -550,6 +551,7 @@ EOF
        fi
  fi
  
@@ -18,7 +18,21 @@
  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 -
-@@ -661,8 +663,6 @@ if [ "\$answer" = "y" ]; then
+@@ -641,6 +643,13 @@ if [ "$?" != "0" ]; then
+       echo passwd_mode=0 >> $config_dir/miniserv.conf
+ fi
+ 
++# Default to having delays on successive incorrect passwords for the same
++# username.
++grep passdelay= $config_dir/miniserv.conf >/dev/null
++if [ "$?" != "0" ]; then
++      echo passdelay=1 >> $config_dir/miniserv.conf
++fi
++
+ # If Perl crypt supports MD5, then make it the default
+ if [ "$md5pass" = "1" ]; then
+       echo md5pass=1 >> $config_dir/config
+@@ -681,8 +690,6 @@ if [ "\$answer" = "y" ]; then
        $config_dir/stop
        echo "Running uninstall scripts .."
        (cd "$wadir" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir LANG= "$wadir/run-uninstalls.pl")