7 files changed, 35 insertions, 26 deletions

diff --git a/sysutils/webmin/PLIST b/sysutils/webmin/PLIST
index 33591b60a16..6b43bd59d18 100644
--- a/sysutils/webmin/PLIST
+++ b/sysutils/webmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/06/07 15:13:46 obache Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/09/01 06:34:59 obache Exp $
 share/examples/rc.d/webmin
 share/examples/webmin/acl/config
 share/examples/webmin/config
@@ -227,6 +227,7 @@ share/webmin/config-msc-linux
 share/webmin/config-netbsd
 share/webmin/config-open-linux
 share/webmin/config-openbsd
+share/webmin/config-openmamba-linux
 share/webmin/config-openserver
 share/webmin/config-osf1
 share/webmin/config-redhat-linux
@@ -263,6 +264,7 @@ share/webmin/cron/config-msc-linux
 share/webmin/cron/config-netbsd
 share/webmin/cron/config-open-linux
 share/webmin/cron/config-openbsd
+share/webmin/cron/config-openmamba-linux
 share/webmin/cron/config-openserver
 share/webmin/cron/config-osf1
 share/webmin/cron/config-redhat-linux
@@ -451,6 +453,7 @@ share/webmin/init/config-msc-linux
 share/webmin/init/config-netbsd
 share/webmin/init/config-open-linux
 share/webmin/init/config-openbsd
+share/webmin/init/config-openmamba-linux
 share/webmin/init/config-openserver
 share/webmin/init/config-osf1
 share/webmin/init/config-redhat-linux
@@ -483,6 +486,7 @@ share/webmin/init/config.info.zh_CN
 share/webmin/init/config.info.zh_CN.UTF-8
 share/webmin/init/config.info.zh_TW.Big5
 share/webmin/init/config.info.zh_TW.UTF-8
+share/webmin/init/create-boot.pl
 share/webmin/init/defaultacl
 share/webmin/init/delboot.pl
 share/webmin/init/delete_action.cgi
@@ -656,6 +660,7 @@ share/webmin/lang/de
 share/webmin/lang/en
 share/webmin/lang/es
 share/webmin/lang/fa
+share/webmin/lang/fi
 share/webmin/lang/fr
 share/webmin/lang/he
 share/webmin/lang/hu
@@ -707,6 +712,7 @@ share/webmin/man/config-netbsd
 share/webmin/man/config-open-linux
 share/webmin/man/config-open-linux-3.1e
 share/webmin/man/config-openbsd
+share/webmin/man/config-openmamba-linux
 share/webmin/man/config-openserver
 share/webmin/man/config-osf1
 share/webmin/man/config-redhat-linux
@@ -1247,6 +1253,7 @@ share/webmin/webmin/config.info.nl
 share/webmin/webmin/config.info.sk
 share/webmin/webmin/config.info.tr
 share/webmin/webmin/cpan_modules.pl
+share/webmin/webmin/clear_blocked.cgi
 share/webmin/webmin/delete_cache.cgi
 share/webmin/webmin/delete_mod.cgi
 share/webmin/webmin/download_cert.cgi
@@ -1255,6 +1262,7 @@ share/webmin/webmin/edit_advanced.cgi
 share/webmin/webmin/edit_anon.cgi
 share/webmin/webmin/edit_assignment.cgi
 share/webmin/webmin/edit_bind.cgi
+share/webmin/webmin/edit_blocked.cgi
 share/webmin/webmin/edit_ca.cgi
 share/webmin/webmin/edit_categories.cgi
 share/webmin/webmin/edit_descs.cgi
@@ -1283,6 +1291,7 @@ share/webmin/webmin/images/advanced.gif
 share/webmin/webmin/images/anon.gif
 share/webmin/webmin/images/assignment.gif
 share/webmin/webmin/images/bind.gif
+share/webmin/webmin/images/blocked.gif
 share/webmin/webmin/images/ca.gif
 share/webmin/webmin/images/categories.gif
 share/webmin/webmin/images/descs.gif
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index a9077179504..50824b8a364 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.13 2007/06/07 15:13:46 obache Exp $
+$NetBSD: distinfo,v 1.14 2007/09/01 06:34:59 obache Exp $
 
-SHA1 (webmin-1.350.tar.gz) = 9834fce7db5fa3ba6709dcbbac9c812da6883895
-RMD160 (webmin-1.350.tar.gz) = a2bb929f3ee67a8240697f82a86595d6b415d067
-Size (webmin-1.350.tar.gz) = 12832134 bytes
+SHA1 (webmin-1.360.tar.gz) = 4839649cc95b7e02c03bcb0430830c089e502525
+RMD160 (webmin-1.360.tar.gz) = fb78e341c9c7561d84a81609ba66e1acd2aaa734
+Size (webmin-1.360.tar.gz) = 13057731 bytes
 SHA1 (patch-aa) = 75b5fe5c5f0a0f83db32e47a3d9bbe277c51decb
 SHA1 (patch-ab) = fa07200462df76af23b9952739388053940c6743
-SHA1 (patch-ad) = ab3975853a0c4815a6c9d0a66bc64ce5018d2301
-SHA1 (patch-ae) = dc32ccf318777410f5cb702ccefb88b0f87fa209
+SHA1 (patch-ad) = 7c7b87f2c5e637eaa4567a2ba4207605e236372c
+SHA1 (patch-ae) = 16583d392d44176e8175e7637851d000ca2ecb9d
 SHA1 (patch-af) = 24f130a985ab7d3bdfc7db8d82114e8b107f1574
 SHA1 (patch-ag) = 4a2ba61d26a3f3a9bb0e1a22a8afb65d66e43746
-SHA1 (patch-ah) = 90617e16d08ccad3925d95c60fbe4002c770069b
-SHA1 (patch-ai) = 196df511dbf8e6d80bedd496f5494b13c7625a3b
+SHA1 (patch-ah) = 9cf6fc0d420535697eac2c32a29701fc095ef67f
+SHA1 (patch-ai) = 14accea4c38882933da3b565fe51adec06db1878
diff --git a/sysutils/webmin/patches/patch-ad b/sysutils/webmin/patches/patch-ad
index 7b5819d54a1..29bbe30d552 100644
--- a/sysutils/webmin/patches/patch-ad
+++ b/sysutils/webmin/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2007/04/21 05:22:58 obache Exp $
+$NetBSD: patch-ad,v 1.4 2007/09/01 06:35:00 obache Exp $
 
---- os_list.txt.orig	2007-04-09 05:00:00.000000000 +0000
+--- os_list.txt.orig	2007-08-02 20:46:22.000000000 +0000
 +++ os_list.txt
-@@ -225,18 +225,14 @@ Caixa Magica			10.0	suse-linux	9.2	`cat 
+@@ -234,18 +234,14 @@ openmamba Linux			$1	openmamba-linux	$1	
  # All FreeBSD versions
  FreeBSD				$1	freebsd		$1	$uname =~ /FreeBSD.*?\s([0-9\.]+)/i
  
diff --git a/sysutils/webmin/patches/patch-ae b/sysutils/webmin/patches/patch-ae
index 7073a7c9a50..2dcda8b8bf9 100644
--- a/sysutils/webmin/patches/patch-ae
+++ b/sysutils/webmin/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2007/04/21 05:22:58 obache Exp $
+$NetBSD: patch-ae,v 1.3 2007/09/01 06:35:00 obache Exp $
 
---- man/module.info.orig	2007-04-09 05:00:48.000000000 +0000
+--- man/module.info.orig	2007-08-02 20:49:05.000000000 +0000
 +++ man/module.info
 @@ -15,7 +15,7 @@ desc_pt=Páginas do Manual
  category=system
  desc_zh_TW.UTF-8=手冊�
  desc_tr=Kýlavuz Sayfalar
--os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux
-+os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux dragonfly
+-os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux
++os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux dragonfly
  desc=System Documentation
  desc_es=Páginas del Manual
  desc_sv=Systemdokumentation
diff --git a/sysutils/webmin/patches/patch-ah b/sysutils/webmin/patches/patch-ah
index 6dc8fb14e05..bd6dfc5c7cc 100644
--- a/sysutils/webmin/patches/patch-ah
+++ b/sysutils/webmin/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.2 2007/04/21 05:22:58 obache Exp $
+$NetBSD: patch-ah,v 1.3 2007/09/01 06:35:00 obache Exp $
 
---- cron/module.info.orig	2007-04-09 05:00:48.000000000 +0000
+--- cron/module.info.orig	2007-08-02 20:49:05.000000000 +0000
 +++ cron/module.info
 @@ -15,7 +15,7 @@ desc_zh_CN=Cron ÈÎÎñµ÷¶È
  category=system
  desc_zh_TW.UTF-8=定時執行工作 (Cron)
  desc_tr=Zamanlandýrýlmýþ Görevler
--os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux windows
-+os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux windows dragonfly
+-os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux windows
++os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux windows dragonfly
  desc=Scheduled Cron Jobs
  desc_es=Tareas Planificadas (Cron)
  desc_sv=Schemalagda cronjobb
diff --git a/sysutils/webmin/patches/patch-ai b/sysutils/webmin/patches/patch-ai
index 0af4411745d..1afb7891e92 100644
--- a/sysutils/webmin/patches/patch-ai
+++ b/sysutils/webmin/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.2 2007/04/21 05:22:58 obache Exp $
+$NetBSD: patch-ai,v 1.3 2007/09/01 06:35:00 obache Exp $
 
---- init/module.info.orig	2007-04-09 05:00:48.000000000 +0000
+--- init/module.info.orig	2007-08-02 20:49:05.000000000 +0000
 +++ init/module.info
 @@ -14,7 +14,7 @@ desc_pt=Iniciar e Encerrar
  category=system
  desc_zh_TW.UTF-8=開機與關機
  desc_tr=Açýlýþ ve Kapanýþ
--os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux windows
-+os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux windows dragonfly
+-os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux openmamba-linux windows
++os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux openmamba-linux windows dragonfly
  desc=Bootup and Shutdown
  desc_es=Arranque y Parada
  desc_sv=Start och avstängning
diff --git a/sysutils/webmin/version.mk b/sysutils/webmin/version.mk
index 3a968e784a1..663e58f3511 100644
--- a/sysutils/webmin/version.mk
+++ b/sysutils/webmin/version.mk
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.2 2007/06/07 15:13:47 obache Exp $
+# $NetBSD: version.mk,v 1.3 2007/09/01 06:34:59 obache Exp $
 
-WBM_VERSION=	1.350
+WBM_VERSION=	1.360