pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/45066: Update sysutils/webmin to 1.550 (patch attached)



>  Actually, I wasn't able to install using the old PLIST, so I generated a =
>  new one using the "make print-PLIST"
>  Having a deeper look, maybe the pkgsrc script is not aware of some other =
>  files. I'm going to investigate and report ASAP.

After some investigation, I found out that the files were correctly copied by 
webmin's 
install script but were never deleted by the deinstall one.
So, considering this, I just left, in the PLIST, the files that are
installed by pkg_add. What gets copied by the install script will be deleted by 
my (patched)
version of  the DEINSTALL procedure.
Actually it works perfectly and is also able to deinstall any external module 
installed
by webmin itself. The version in pkgsrc is the minimal one, so the user will 
then install
all the needed module.

Attached here is the last version of my patch. 

Please, let me know if it's ok or not. 

Stefano

Index: webmin/DEINSTALL
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/DEINSTALL,v
retrieving revision 1.5
diff -u -p -r1.5 DEINSTALL
--- webmin/DEINSTALL    8 Oct 2007 08:47:03 -0000       1.5
+++ webmin/DEINSTALL    16 Jun 2011 07:57:24 -0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.5 2007/10/08 08:47:03 obache Exp $
+# $NetBSD: DEINSTALL,v 1.4 2006/05/16 04:01:28 jlam Exp $
 
 case ${STAGE} in
 DEINSTALL)
Index: webmin/INSTALL
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/INSTALL,v
retrieving revision 1.1
diff -u -p -r1.1 INSTALL
--- webmin/INSTALL      8 Oct 2007 08:47:05 -0000       1.1
+++ webmin/INSTALL      16 Jun 2011 07:57:24 -0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1 2007/10/08 08:47:05 obache Exp $
+# $NetBSD$
 
 case ${STAGE} in
 POST-INSTALL)
Index: webmin/MESSAGE
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/MESSAGE,v
retrieving revision 1.4
diff -u -p -r1.4 MESSAGE
--- webmin/MESSAGE      16 May 2006 18:30:20 -0000      1.4
+++ webmin/MESSAGE      16 Jun 2011 07:57:24 -0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/05/16 18:30:20 jlam Exp $
+$NetBSD: MESSAGE,v 1.4 2005/11/14 08:05:27 jlam Exp $
 
 By default, the Webmin server listens on port 10000, e.g. it may be
 accessed at:
Index: webmin/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- webmin/Makefile     17 Jan 2010 12:02:46 -0000      1.28
+++ webmin/Makefile     16 Jun 2011 07:57:24 -0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.28 2010/01/17 12:02:46 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/16 17:45:26 kefren Exp $
 
 .include "version.mk"
 
 DISTNAME=      webmin-${WBM_VERSION}
-PKGREVISION=   3
+PKGREVISION=   0
 CATEGORIES=    sysutils www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=webadmin/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.webmin.com/
 COMMENT=       Perl web server and CGI for Unix system administration
+LICENSE=        modified-bsd
 
 DEPENDS+=      p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
 
Index: webmin/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- webmin/PLIST        14 Jun 2009 18:16:20 -0000      1.14
+++ webmin/PLIST        16 Jun 2011 07:57:24 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 18:16:20 joerg Exp $
+@comment $NetBSD$
 share/examples/rc.d/webmin
 share/examples/webmin/acl/config
 share/examples/webmin/config
@@ -21,123 +21,19 @@ share/examples/webmin/version
 share/examples/webmin/webmin.acl
 share/examples/webmin/webmin/config
 share/examples/webmin/webminlog/config
-share/webmin/LICENCE
-share/webmin/LICENCE.ja
-share/webmin/PATENTS
-share/webmin/README
-share/webmin/WebminCore.pm
-share/webmin/Webmin/All.pm
-share/webmin/Webmin/Button.pm
-share/webmin/Webmin/Checkbox.pm
-share/webmin/Webmin/Checkboxes.pm
-share/webmin/Webmin/Columns.pm
-share/webmin/Webmin/ConfirmPage.pm
-share/webmin/Webmin/Date.pm
-share/webmin/Webmin/DynamicBar.pm
-share/webmin/Webmin/DynamicHTML.pm
-share/webmin/Webmin/DynamicText.pm
-share/webmin/Webmin/DynamicWait.pm
-share/webmin/Webmin/ErrorPage.pm
-share/webmin/Webmin/File.pm
-share/webmin/Webmin/Form.pm
-share/webmin/Webmin/Group.pm
-share/webmin/Webmin/Icon.pm
-share/webmin/Webmin/Input.pm
-share/webmin/Webmin/InputTable.pm
-share/webmin/Webmin/JavascriptButton.pm
-share/webmin/Webmin/LinkTable.pm
-share/webmin/Webmin/Menu.pm
-share/webmin/Webmin/Multiline.pm
-share/webmin/Webmin/OptTextarea.pm
-share/webmin/Webmin/OptTextbox.pm
-share/webmin/Webmin/Page.pm
-share/webmin/Webmin/Password.pm
-share/webmin/Webmin/PlainText.pm
-share/webmin/Webmin/Properties.pm
-share/webmin/Webmin/Radios.pm
-share/webmin/Webmin/ResultPage.pm
-share/webmin/Webmin/Section.pm
-share/webmin/Webmin/Select.pm
-share/webmin/Webmin/Submit.pm
-share/webmin/Webmin/Table.pm
-share/webmin/Webmin/TableAction.pm
-share/webmin/Webmin/Tabs.pm
-share/webmin/Webmin/Textarea.pm
-share/webmin/Webmin/Textbox.pm
-share/webmin/Webmin/Time.pm
-share/webmin/Webmin/TitleList.pm
-share/webmin/Webmin/Upload.pm
-share/webmin/Webmin/User.pm
-share/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
-share/webmin/acl/Authen-SolarisRBAC-0.1/Changes
-share/webmin/acl/Authen-SolarisRBAC-0.1/MANIFEST
-share/webmin/acl/Authen-SolarisRBAC-0.1/Makefile
-share/webmin/acl/Authen-SolarisRBAC-0.1/Makefile.PL
-share/webmin/acl/Authen-SolarisRBAC-0.1/Makefile.old
-share/webmin/acl/Authen-SolarisRBAC-0.1/SolarisRBAC.bs
-share/webmin/acl/Authen-SolarisRBAC-0.1/SolarisRBAC.c
-share/webmin/acl/Authen-SolarisRBAC-0.1/SolarisRBAC.o
-share/webmin/acl/Authen-SolarisRBAC-0.1/SolarisRBAC.pm
-share/webmin/acl/Authen-SolarisRBAC-0.1/SolarisRBAC.xs
-share/webmin/acl/Authen-SolarisRBAC-0.1/blib/arch/auto/Authen/SolarisRBAC/.exists
-share/webmin/acl/Authen-SolarisRBAC-0.1/blib/arch/auto/Authen/SolarisRBAC/SolarisRBAC.bs
-share/webmin/acl/Authen-SolarisRBAC-0.1/blib/arch/auto/Authen/SolarisRBAC/SolarisRBAC.so
-share/webmin/acl/Authen-SolarisRBAC-0.1/blib/lib/Authen/.exists
-share/webmin/acl/Authen-SolarisRBAC-0.1/blib/lib/Authen/SolarisRBAC.pm
-share/webmin/acl/Authen-SolarisRBAC-0.1/blib/lib/auto/Authen/SolarisRBAC/.exists
-share/webmin/acl/Authen-SolarisRBAC-0.1/blib/man3/.exists
-share/webmin/acl/Authen-SolarisRBAC-0.1/blib/man3/Authen::SolarisRBAC.3
-share/webmin/acl/Authen-SolarisRBAC-0.1/pm_to_blib
-share/webmin/acl/Authen-SolarisRBAC-0.1/test.pl
-share/webmin/acl/CHANGELOG
-share/webmin/acl/acl-lib.pl
-share/webmin/acl/acl_security.pl
-share/webmin/acl/backup_config.pl
 share/webmin/acl/cert_form.cgi
 share/webmin/acl/cert_issue.cgi
-share/webmin/acl/cert_issue_ie.cgi
 share/webmin/acl/cert_output.cgi
 share/webmin/acl/config
 share/webmin/acl/config-*-linux
 share/webmin/acl/config-dragonfly
 share/webmin/acl/config-freebsd
 share/webmin/acl/config-macos
-share/webmin/acl/config-netbsd
+share/webmin/acl/config-${LOWER_OPSYS}
 share/webmin/acl/config-openbsd
 share/webmin/acl/config-solaris-10-*
-share/webmin/acl/config.info
-share/webmin/acl/config.info.bg
-share/webmin/acl/config.info.ca
-share/webmin/acl/config.info.cz
-share/webmin/acl/config.info.da
-share/webmin/acl/config.info.de
-share/webmin/acl/config.info.hr
-share/webmin/acl/config.info.it
-share/webmin/acl/config.info.es
-share/webmin/acl/config.info.fa
-share/webmin/acl/config.info.fr
-share/webmin/acl/config.info.hu
-share/webmin/acl/config.info.ja_JP.UTF-8
-share/webmin/acl/config.info.ja_JP.euc
-share/webmin/acl/config.info.ko_KR.UTF-8
-share/webmin/acl/config.info.ko_KR.euc
-share/webmin/acl/config.info.nl
-share/webmin/acl/config.info.no
-share/webmin/acl/config.info.pl
-share/webmin/acl/config.info.pt_BR
-share/webmin/acl/config.info.ru_RU
-share/webmin/acl/config.info.ru_SU
-share/webmin/acl/config.info.sk
-share/webmin/acl/config.info.sv
-share/webmin/acl/config.info.tr
-share/webmin/acl/config.info.uk_UA
-share/webmin/acl/config.info.zh_CN
-share/webmin/acl/config.info.zh_CN.UTF-8
-share/webmin/acl/config.info.zh_TW.Big5
-share/webmin/acl/config.info.zh_TW.UTF-8
 share/webmin/acl/convert.cgi
 share/webmin/acl/convert_form.cgi
-share/webmin/acl/defaultacl
 share/webmin/acl/delete_group.cgi
 share/webmin/acl/delete_groups.cgi
 share/webmin/acl/delete_session.cgi
@@ -147,176 +43,30 @@ share/webmin/acl/edit_acl.cgi
 share/webmin/acl/edit_group.cgi
 share/webmin/acl/edit_pass.cgi
 share/webmin/acl/edit_rbac.cgi
+share/webmin/acl/edit_sql.cgi
 share/webmin/acl/edit_sync.cgi
 share/webmin/acl/edit_unix.cgi
 share/webmin/acl/edit_user.cgi
-share/webmin/acl/feedback_files.pl
-share/webmin/acl/help/ips.ca.html
-share/webmin/acl/help/ips.da.html
-share/webmin/acl/help/ips.de.html
-share/webmin/acl/help/ips.it.html
-share/webmin/acl/help/ips.fa.html
-share/webmin/acl/help/ips.fr.html
-share/webmin/acl/help/ips.html
-share/webmin/acl/help/ips.ko_KR.euc.html
-share/webmin/acl/help/ips.ko_KR.UTF-8.html
-share/webmin/acl/help/ips.sk.html
-share/webmin/acl/images/cert.gif
-share/webmin/acl/images/convert.gif
-share/webmin/acl/images/empty.gif
-share/webmin/acl/images/icon.gif
-share/webmin/acl/images/pass.gif
-share/webmin/acl/images/rbac.gif
-share/webmin/acl/images/sessions.gif
-share/webmin/acl/images/smallicon.gif
-share/webmin/acl/images/sync.gif
-share/webmin/acl/images/tick.gif
-share/webmin/acl/images/unix.gif
 share/webmin/acl/index.cgi
-share/webmin/acl/lang/bg
-share/webmin/acl/lang/ca
-share/webmin/acl/lang/cz
-share/webmin/acl/lang/da
-share/webmin/acl/lang/de
-share/webmin/acl/lang/en
-share/webmin/acl/lang/es
-share/webmin/acl/lang/fa
-share/webmin/acl/lang/fr
-share/webmin/acl/lang/hr
-share/webmin/acl/lang/hu
-share/webmin/acl/lang/it
-share/webmin/acl/lang/ja_JP.UTF-8
-share/webmin/acl/lang/ja_JP.euc
-share/webmin/acl/lang/ko_KR.UTF-8
-share/webmin/acl/lang/ko_KR.euc
-share/webmin/acl/lang/nl
-share/webmin/acl/lang/no
-share/webmin/acl/lang/pl
-share/webmin/acl/lang/pt
-share/webmin/acl/lang/pt_BR
-share/webmin/acl/lang/ru_RU
-share/webmin/acl/lang/ru_SU
-share/webmin/acl/lang/sk
-share/webmin/acl/lang/sv
-share/webmin/acl/lang/tr
-share/webmin/acl/lang/uk_UA
-share/webmin/acl/lang/zh_CN
-share/webmin/acl/lang/zh_CN.UTF-8
-share/webmin/acl/lang/zh_TW.Big5
-share/webmin/acl/lang/zh_TW.UTF-8
 share/webmin/acl/list_sessions.cgi
-share/webmin/acl/log_parser.pl
-share/webmin/acl/md5-lib.pl
-share/webmin/acl/module.info
-share/webmin/acl/openssl.cnf
-share/webmin/acl/postinstall.pl
+share/webmin/acl/makedn.cgi
+share/webmin/acl/maketables.cgi
 share/webmin/acl/save_acl.cgi
 share/webmin/acl/save_group.cgi
 share/webmin/acl/save_pass.cgi
+share/webmin/acl/save_sql.cgi
 share/webmin/acl/save_sync.cgi
 share/webmin/acl/save_unix.cgi
 share/webmin/acl/save_user.cgi
+share/webmin/acl/schema.cgi
 share/webmin/acl/switch.cgi
-share/webmin/acl/useradmin_update.pl
-share/webmin/acl/xenroll.dll
-share/webmin/acl_security.pl
 share/webmin/changepass.pl
 share/webmin/chooser.cgi
-share/webmin/config-aix
-share/webmin/config-cobalt-linux
-share/webmin/config-coherent-linux
-share/webmin/config-corel-linux
-share/webmin/config-debian-linux
-share/webmin/config-freebsd
-share/webmin/config-generic-linux
-share/webmin/config-gentoo-linux
-share/webmin/config-hpux
-share/webmin/config-irix
-share/webmin/config-lib.pl
-share/webmin/config-macos
-share/webmin/config-mandrake-linux
-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
-share/webmin/config-slackware-linux
-share/webmin/config-sol-linux
-share/webmin/config-solaris
-share/webmin/config-suse-linux
-share/webmin/config-trustix-linux
-share/webmin/config-turbo-linux
-share/webmin/config-united-linux
-share/webmin/config-unixware
-share/webmin/config-windows
 share/webmin/config.cgi
 share/webmin/config_save.cgi
 share/webmin/copyconfig.pl
 share/webmin/create-module.pl
-share/webmin/cron/CHANGELOG
-share/webmin/cron/acl_security.pl
-share/webmin/cron/backup_config.pl
-share/webmin/cron/config-aix
-share/webmin/cron/config-cobalt-linux
-share/webmin/cron/config-coherent-linux
-share/webmin/cron/config-corel-linux
-share/webmin/cron/config-debian-linux
-share/webmin/cron/config-debian-linux-2.1-*
-share/webmin/cron/config-freebsd
-share/webmin/cron/config-generic-linux
-share/webmin/cron/config-gentoo-linux
-share/webmin/cron/config-hpux
-share/webmin/cron/config-irix
-share/webmin/cron/config-macos
-share/webmin/cron/config-mandrake-linux
-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
-share/webmin/cron/config-slackware-linux
-share/webmin/cron/config-sol-linux
-share/webmin/cron/config-solaris
-share/webmin/cron/config-suse-linux
-share/webmin/cron/config-suse-linux-7.0-8.0
-share/webmin/cron/config-suse-linux-8.2-*
-share/webmin/cron/config-trustix-linux
-share/webmin/cron/config-turbo-linux
-share/webmin/cron/config-united-linux
-share/webmin/cron/config-unixware
-share/webmin/cron/config-windows
-share/webmin/cron/config.info
-share/webmin/cron/config.info.ca
-share/webmin/cron/config.info.cz
-share/webmin/cron/config.info.de
-share/webmin/cron/config.info.es
-share/webmin/cron/config.info.fa
-share/webmin/cron/config.info.fr
-share/webmin/cron/config.info.hu
-share/webmin/cron/config.info.ja_JP.UTF-8
-share/webmin/cron/config.info.ja_JP.euc
-share/webmin/cron/config.info.ms
-share/webmin/cron/config.info.nl
-share/webmin/cron/config.info.pl
-share/webmin/cron/config.info.ru_RU
-share/webmin/cron/config.info.ru_SU
-share/webmin/cron/config.info.sk
-share/webmin/cron/config.info.sv
-share/webmin/cron/config.info.tr
-share/webmin/cron/config.info.uk_UA
-share/webmin/cron/config.info.zh_CN
-share/webmin/cron/config.info.zh_CN.UTF-8
-share/webmin/cron/config.info.zh_TW.Big5
-share/webmin/cron/config.info.zh_TW.UTF-8
-share/webmin/cron/cron-lib.pl
 share/webmin/cron/cron_editor.pl
-share/webmin/cron/defaultacl
 share/webmin/cron/delete_cron.cgi
 share/webmin/cron/delete_env.cgi
 share/webmin/cron/delete_jobs.cgi
@@ -324,239 +74,37 @@ share/webmin/cron/edit_allow.cgi
 share/webmin/cron/edit_cron.cgi
 share/webmin/cron/edit_env.cgi
 share/webmin/cron/exec_cron.cgi
-share/webmin/cron/feedback_files.pl
-share/webmin/cron/help/help.ca.html
-share/webmin/cron/help/help.de.html
-share/webmin/cron/help/help.es.html
-share/webmin/cron/help/help.fr.html
-share/webmin/cron/help/help.html
-share/webmin/cron/help/help.it.html
-share/webmin/cron/help/help.nl.html
-share/webmin/cron/help/help.sv.html
-share/webmin/cron/help/help.zh_TW.Big5.html
-share/webmin/cron/help/help.zh_TW.UTF-8.html
-share/webmin/cron/help/intro.ca.html
-share/webmin/cron/help/intro.de.html
-share/webmin/cron/help/intro.es.html
-share/webmin/cron/help/intro.fa.html
-share/webmin/cron/help/intro.fr.html
-share/webmin/cron/help/intro.html
-share/webmin/cron/help/intro.hu.html
-share/webmin/cron/help/intro.it.html
-share/webmin/cron/help/intro.nl.html
-share/webmin/cron/help/intro.sv.html
-share/webmin/cron/help/intro.zh_TW.Big5.html
-share/webmin/cron/help/intro.zh_TW.UTF-8.html
-share/webmin/cron/images/down.gif
-share/webmin/cron/images/gap.gif
-share/webmin/cron/images/icon.gif
-share/webmin/cron/images/smallicon.gif
-share/webmin/cron/images/up.gif
 share/webmin/cron/index.cgi
-share/webmin/cron/install_check.pl
 share/webmin/cron/kill_cron.cgi
-share/webmin/cron/lang/bg
-share/webmin/cron/lang/ca
-share/webmin/cron/lang/cz
-share/webmin/cron/lang/de
-share/webmin/cron/lang/en
-share/webmin/cron/lang/es
-share/webmin/cron/lang/fa
-share/webmin/cron/lang/fr
-share/webmin/cron/lang/hu
-share/webmin/cron/lang/it
-share/webmin/cron/lang/ja_JP.UTF-8
-share/webmin/cron/lang/ja_JP.euc
-share/webmin/cron/lang/ko_KR.UTF-8
-share/webmin/cron/lang/ko_KR.euc
-share/webmin/cron/lang/ms
-share/webmin/cron/lang/nl
-share/webmin/cron/lang/pl
-share/webmin/cron/lang/pt
-share/webmin/cron/lang/ru_RU
-share/webmin/cron/lang/ru_SU
-share/webmin/cron/lang/sk
-share/webmin/cron/lang/sv
-share/webmin/cron/lang/tr
-share/webmin/cron/lang/uk_UA
-share/webmin/cron/lang/zh_CN
-share/webmin/cron/lang/zh_CN.UTF-8
-share/webmin/cron/lang/zh_TW.Big5
-share/webmin/cron/lang/zh_TW.UTF-8
-share/webmin/cron/log_parser.pl
-share/webmin/cron/module.info
 share/webmin/cron/move.cgi
-share/webmin/cron/postinstall.pl
 share/webmin/cron/range.pl
-share/webmin/cron/rbac-mapping
 share/webmin/cron/save_allow.cgi
 share/webmin/cron/save_cron.cgi
 share/webmin/cron/save_env.cgi
-share/webmin/cron/tempdelete.pl
-share/webmin/cron/uninstall.pl
-share/webmin/cron/useradmin_update.pl
 share/webmin/date_chooser.cgi
-share/webmin/defaultacl
-share/webmin/defaulttheme
-share/webmin/entities_map.txt
 share/webmin/fastrpc.cgi
-share/webmin/favicon.ico
 share/webmin/feedback.cgi
 share/webmin/feedback_form.cgi
 share/webmin/group_chooser.cgi
 share/webmin/help.cgi
-share/webmin/images/1x1.gif
-share/webmin/images/audio.gif
-share/webmin/images/back.gif
-share/webmin/images/binary.gif
-share/webmin/images/critical.gif
-share/webmin/images/closed.gif
-share/webmin/images/dir.gif
-share/webmin/images/first-grey.gif
-share/webmin/images/first.gif
-share/webmin/images/image.gif
-share/webmin/images/last-grey.gif
-share/webmin/images/last.gif
-share/webmin/images/lc1.gif
-share/webmin/images/lc2.gif
-share/webmin/images/left-grey.gif
-share/webmin/images/left.gif
-share/webmin/images/major.gif
-share/webmin/images/minor.gif
-share/webmin/images/newlogo.gif
-share/webmin/images/nosort.gif
-share/webmin/images/ok.gif
-share/webmin/images/open.gif
-share/webmin/images/rc1.gif
-share/webmin/images/rc2.gif
-share/webmin/images/right-grey.gif
-share/webmin/images/right.gif
-share/webmin/images/smalllogo.gif
-share/webmin/images/sort.gif
-share/webmin/images/sortasc.gif
-share/webmin/images/sortascgrey.gif
-share/webmin/images/sortdesc.gif
-share/webmin/images/sortdescgrey.gif
-share/webmin/images/text.gif
-share/webmin/images/unknown.gif
-share/webmin/images/usermin.gif
-share/webmin/images/webmin-mini.xpm
-share/webmin/images/webmin.gif
-share/webmin/images/webmin.xpm
 share/webmin/index.cgi
-share/webmin/init/CHANGELOG
-share/webmin/init/acl_security.pl
 share/webmin/init/atboot.pl
-share/webmin/init/backup_config.pl
 share/webmin/init/change_rl.cgi
-share/webmin/init/config-aix
-share/webmin/init/config-cobalt-linux-2.2-4.0
-share/webmin/init/config-cobalt-linux-5.0-*
-share/webmin/init/config-coherent-linux
-share/webmin/init/config-corel-linux
-share/webmin/init/config-debian-linux
-share/webmin/init/config-dragonfly
-share/webmin/init/config-freebsd
-share/webmin/init/config-freebsd-5.0-*
-share/webmin/init/config-generic-linux
-share/webmin/init/config-gentoo-linux
-share/webmin/init/config-hpux
-share/webmin/init/config-irix
-share/webmin/init/config-macos
-share/webmin/init/config-mandrake-linux
-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
-share/webmin/init/config-slackware-linux
-share/webmin/init/config-solaris
-share/webmin/init/config-solaris-10-*
-share/webmin/init/config-suse-linux
-share/webmin/init/config-suse-linux-7.1-*
-share/webmin/init/config-trustix-linux
-share/webmin/init/config-turbo-linux
-share/webmin/init/config-united-linux
-share/webmin/init/config-unixware
-share/webmin/init/config-windows
-share/webmin/init/config.info
-share/webmin/init/config.info.ca
-share/webmin/init/config.info.de
-share/webmin/init/config.info.es
-share/webmin/init/config.info.fa
-share/webmin/init/config.info.fr
-share/webmin/init/config.info.ja_JP.UTF-8
-share/webmin/init/config.info.ja_JP.euc
-share/webmin/init/config.info.pl
-share/webmin/init/config.info.ru_RU
-share/webmin/init/config.info.ru_SU
-share/webmin/init/config.info.sk
-share/webmin/init/config.info.sv
-share/webmin/init/config.info.tr
-share/webmin/init/config.info.uk_UA
-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-boot.pl
 share/webmin/init/delete_action.cgi
 share/webmin/init/edit_action.cgi
 share/webmin/init/edit_hostconfig.cgi
 share/webmin/init/edit_rc.cgi
+share/webmin/init/edit_upstart.cgi
 share/webmin/init/fix_action.cgi
-share/webmin/init/help/help.ca.html
-share/webmin/init/help/help.de.html
-share/webmin/init/help/help.es.html
-share/webmin/init/help/help.fa.html
-share/webmin/init/help/help.html
-share/webmin/init/help/help.sv.html
-share/webmin/init/help/proc.ca.html
-share/webmin/init/help/proc.de.html
-share/webmin/init/help/proc.es.html
-share/webmin/init/help/proc.fa.html
-share/webmin/init/help/proc.html
-share/webmin/init/help/proc.sv.html
 share/webmin/init/hostconfig-lib.pl
-share/webmin/init/images/icon.gif
-share/webmin/init/images/smallicon.gif
 share/webmin/init/index.cgi
-share/webmin/init/init-lib.pl
-share/webmin/init/lang/ca
-share/webmin/init/lang/de
-share/webmin/init/lang/en
-share/webmin/init/lang/es
-share/webmin/init/lang/fa
-share/webmin/init/lang/fr
-share/webmin/init/lang/it
-share/webmin/init/lang/ja_JP.UTF-8
-share/webmin/init/lang/ja_JP.euc
-share/webmin/init/lang/ko_KR.UTF-8
-share/webmin/init/lang/ko_KR.euc
-share/webmin/init/lang/pl
-share/webmin/init/lang/pt
-share/webmin/init/lang/ru_RU
-share/webmin/init/lang/ru_SU
-share/webmin/init/lang/sk
-share/webmin/init/lang/sv
-share/webmin/init/lang/tr
-share/webmin/init/lang/uk_UA
-share/webmin/init/lang/zh_CN
-share/webmin/init/lang/zh_CN.UTF-8
-share/webmin/init/lang/zh_TW.Big5
-share/webmin/init/lang/zh_TW.UTF-8
-share/webmin/init/log_parser.pl
-share/webmin/init/low.risk
 share/webmin/init/mass_rcs.cgi
 share/webmin/init/mass_start_stop.cgi
-share/webmin/init/medium.risk
+share/webmin/init/mass_upstarts.cgi
 share/webmin/init/modifyhostconfig.cgi
-share/webmin/init/module.info
-share/webmin/init/rbac-mapping
 share/webmin/init/reboot.cgi
 share/webmin/init/save_action.cgi
 share/webmin/init/save_hostconfig_action.cgi
@@ -564,244 +112,18 @@ share/webmin/init/save_local.cgi
 share/webmin/init/save_rc.cgi
 share/webmin/init/save_services.cgi
 share/webmin/init/save_startscript.cgi
+share/webmin/init/save_upstart.cgi
 share/webmin/init/shutdown.cgi
 share/webmin/init/start_stop.cgi
-share/webmin/init/uninstall.pl
 share/webmin/init/win32.pl
-share/webmin/inittab/CHANGELOG
 share/webmin/inittab/apply.cgi
-share/webmin/inittab/backup_config.pl
-share/webmin/inittab/config
-share/webmin/inittab/config-solaris
-share/webmin/inittab/config.info
-share/webmin/inittab/config.info.ca
-share/webmin/inittab/config.info.de
-share/webmin/inittab/config.info.es
-share/webmin/inittab/config.info.fr
-share/webmin/inittab/config.info.ko_KR.euc
-share/webmin/inittab/config.info.ms
-share/webmin/inittab/config.info.pl
-share/webmin/inittab/config.info.ru_RU
-share/webmin/inittab/config.info.ru_SU
-share/webmin/inittab/config.info.sv
-share/webmin/inittab/config.info.tr
-share/webmin/inittab/config.info.uk_UA
-share/webmin/inittab/config.info.zh_CN
-share/webmin/inittab/config.info.zh_CN.UTF-8
-share/webmin/inittab/config.info.zh_TW.Big5
-share/webmin/inittab/config.info.zh_TW.UTF-8
 share/webmin/inittab/delete.cgi
 share/webmin/inittab/edit_inittab.cgi
-share/webmin/inittab/help/action.ca.html
-share/webmin/inittab/help/action.es.html
-share/webmin/inittab/help/action.fr.html
-share/webmin/inittab/help/action.html
-share/webmin/inittab/help/action.pl.html
-share/webmin/inittab/help/action.ru_RU.html
-share/webmin/inittab/help/action.ru_SU.html
-share/webmin/inittab/help/action.sv.html
-share/webmin/inittab/help/active.ca.html
-share/webmin/inittab/help/active.html
-share/webmin/inittab/help/id.ca.html
-share/webmin/inittab/help/id.es.html
-share/webmin/inittab/help/id.fr.html
-share/webmin/inittab/help/id.html
-share/webmin/inittab/help/id.pl.html
-share/webmin/inittab/help/id.ru_RU.html
-share/webmin/inittab/help/id.ru_SU.html
-share/webmin/inittab/help/id.sv.html
-share/webmin/inittab/help/index.ca.html
-share/webmin/inittab/help/index.es.html
-share/webmin/inittab/help/index.fr.html
-share/webmin/inittab/help/index.html
-share/webmin/inittab/help/index.pl.html
-share/webmin/inittab/help/index.ru_RU.html
-share/webmin/inittab/help/index.ru_SU.html
-share/webmin/inittab/help/index.sv.html
-share/webmin/inittab/help/process.ca.html
-share/webmin/inittab/help/process.es.html
-share/webmin/inittab/help/process.fr.html
-share/webmin/inittab/help/process.html
-share/webmin/inittab/help/process.pl.html
-share/webmin/inittab/help/process.ru_RU.html
-share/webmin/inittab/help/process.ru_SU.html
-share/webmin/inittab/help/process.sv.html
-share/webmin/inittab/help/runlevels.ca.html
-share/webmin/inittab/help/runlevels.es.html
-share/webmin/inittab/help/runlevels.fr.html
-share/webmin/inittab/help/runlevels.html
-share/webmin/inittab/help/runlevels.pl.html
-share/webmin/inittab/help/runlevels.ru_RU.html
-share/webmin/inittab/help/runlevels.ru_SU.html
-share/webmin/inittab/help/runlevels.sv.html
-share/webmin/inittab/images/icon.gif
-share/webmin/inittab/images/smallicon.gif
 share/webmin/inittab/index.cgi
 share/webmin/inittab/inittab-lib.pl
-share/webmin/inittab/install_check.pl
-share/webmin/inittab/lang/ca
-share/webmin/inittab/lang/de
-share/webmin/inittab/lang/en
-share/webmin/inittab/lang/es
-share/webmin/inittab/lang/fr
-share/webmin/inittab/lang/ja_JP.UTF-8
-share/webmin/inittab/lang/ja_JP.euc
-share/webmin/inittab/lang/ko_KR.UTF-8
-share/webmin/inittab/lang/ko_KR.euc
-share/webmin/inittab/lang/ms
-share/webmin/inittab/lang/pl
-share/webmin/inittab/lang/ru_RU
-share/webmin/inittab/lang/ru_SU
-share/webmin/inittab/lang/sv
-share/webmin/inittab/lang/tr
-share/webmin/inittab/lang/uk_UA
-share/webmin/inittab/lang/zh_CN
-share/webmin/inittab/lang/zh_CN.UTF-8
-share/webmin/inittab/lang/zh_TW.Big5
-share/webmin/inittab/lang/zh_TW.UTF-8
-share/webmin/inittab/log_parser.pl
-share/webmin/inittab/module.info
 share/webmin/inittab/save_inittab.cgi
 share/webmin/install-module.pl
-share/webmin/install-type
-share/webmin/javascript-lib.pl
-share/webmin/lang/af
-share/webmin/lang/ar
-share/webmin/lang/bg
-share/webmin/lang/ca
-share/webmin/lang/cz
-share/webmin/lang/da
-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
-share/webmin/lang/it
-share/webmin/lang/ja_JP.UTF-8
-share/webmin/lang/ja_JP.euc
-share/webmin/lang/ko_KR.UTF-8
-share/webmin/lang/ko_KR.euc
-share/webmin/lang/lt
-share/webmin/lang/ms
-share/webmin/lang/nl
-share/webmin/lang/no
-share/webmin/lang/pl
-share/webmin/lang/pt
-share/webmin/lang/pt_BR
-share/webmin/lang/ro
-share/webmin/lang/ru_RU
-share/webmin/lang/ru_SU
-share/webmin/lang/si
-share/webmin/lang/sk
-share/webmin/lang/sv
-share/webmin/lang/th
-share/webmin/lang/tr
-share/webmin/lang/ua
-share/webmin/lang/uk_UA
-share/webmin/lang/zh_CN
-share/webmin/lang/zh_CN.UTF-8
-share/webmin/lang/zh_TW.Big5
-share/webmin/lang/zh_TW.UTF-8
-share/webmin/lang_list.txt
-share/webmin/maketemp.pl
-share/webmin/man/CHANGELOG
-share/webmin/man/config-aix
-share/webmin/man/config-cobalt-linux
-share/webmin/man/config-coherent-linux
-share/webmin/man/config-corel-linux
-share/webmin/man/config-debian-linux
-share/webmin/man/config-dragonfly
-share/webmin/man/config-freebsd
-share/webmin/man/config-generic-linux
-share/webmin/man/config-gentoo-linux
-share/webmin/man/config-hpux
-share/webmin/man/config-irix
-share/webmin/man/config-lfs-linux
-share/webmin/man/config-macos
-share/webmin/man/config-mandrake-linux
-share/webmin/man/config-msc-linux
-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
-share/webmin/man/config-redhat-linux-7.0-*
-share/webmin/man/config-slackware-linux
-share/webmin/man/config-sol-linux
-share/webmin/man/config-solaris
-share/webmin/man/config-suse-linux
-share/webmin/man/config-suse-linux-7.1
-share/webmin/man/config-suse-linux-7.2-8.0
-share/webmin/man/config-suse-linux-8.2-*
-share/webmin/man/config-trustix-linux
-share/webmin/man/config-turbo-linux
-share/webmin/man/config-united-linux
-share/webmin/man/config.info
-share/webmin/man/config.info.ca
-share/webmin/man/config.info.de
-share/webmin/man/config.info.es
-share/webmin/man/config.info.fr
-share/webmin/man/config.info.hu
-share/webmin/man/config.info.it
-share/webmin/man/config.info.ms
-share/webmin/man/config.info.pl
-share/webmin/man/config.info.ru_RU
-share/webmin/man/config.info.ru_SU
-share/webmin/man/config.info.sk
-share/webmin/man/config.info.sv
-share/webmin/man/config.info.tr
-share/webmin/man/config.info.uk_UA
-share/webmin/man/config.info.zh_CN
-share/webmin/man/config.info.zh_CN.UTF-8
-share/webmin/man/config.info.zh_TW.Big5
-share/webmin/man/config.info.zh_TW.UTF-8
-share/webmin/man/help/intro.ca.html
-share/webmin/man/help/intro.de.html
-share/webmin/man/help/intro.es.html
-share/webmin/man/help/intro.fr.html
-share/webmin/man/help/intro.html
-share/webmin/man/help/intro.hu.html
-share/webmin/man/help/intro.it.html
-share/webmin/man/help/intro.pl.html
-share/webmin/man/help/intro.ru_RU.html
-share/webmin/man/help/intro.ru_SU.html
-share/webmin/man/help/intro.sk.html
-share/webmin/man/help/intro.sv.html
-share/webmin/man/images/icon.gif
-share/webmin/man/images/smallicon.gif
 share/webmin/man/index.cgi
-share/webmin/man/lang/ca
-share/webmin/man/lang/cz
-share/webmin/man/lang/de
-share/webmin/man/lang/en
-share/webmin/man/lang/es
-share/webmin/man/lang/fr
-share/webmin/man/lang/hu
-share/webmin/man/lang/it
-share/webmin/man/lang/ja_JP.UTF-8
-share/webmin/man/lang/ja_JP.euc
-share/webmin/man/lang/ko_KR.UTF-8
-share/webmin/man/lang/ko_KR.euc
-share/webmin/man/lang/ms
-share/webmin/man/lang/pl
-share/webmin/man/lang/ru_RU
-share/webmin/man/lang/ru_SU
-share/webmin/man/lang/sk
-share/webmin/man/lang/sv
-share/webmin/man/lang/tr
-share/webmin/man/lang/uk_UA
-share/webmin/man/lang/zh_CN
-share/webmin/man/lang/zh_CN.UTF-8
-share/webmin/man/lang/zh_TW.Big5
-share/webmin/man/lang/zh_TW.UTF-8
-share/webmin/man/man-lib.pl
-share/webmin/man/module.info
 share/webmin/man/save_check.cgi
 share/webmin/man/search.cgi
 share/webmin/man/view_doc.cgi
@@ -810,259 +132,14 @@ share/webmin/man/view_kde.cgi
 share/webmin/man/view_kernel.cgi
 share/webmin/man/view_man.cgi
 share/webmin/man/view_perl.cgi
-share/webmin/mime.types
 share/webmin/minimal-install
-share/webmin/miniserv.pem
 share/webmin/miniserv.pl
 share/webmin/module_chooser.cgi
-share/webmin/newmods.pl
-share/webmin/os_list.txt
-share/webmin/oschooser.pl
 share/webmin/pam_login.cgi
 share/webmin/password_change.cgi
 share/webmin/password_form.cgi
 share/webmin/perlpath.pl
-share/webmin/proc/BorderPanel.class
-share/webmin/proc/BorderPanel.java
-share/webmin/proc/CHANGELOG
-share/webmin/proc/CbButton.class
-share/webmin/proc/CbButton.java
-share/webmin/proc/CbButtonCallback.class
-share/webmin/proc/CbButtonGroup.class
-share/webmin/proc/CbScrollbar.class
-share/webmin/proc/CbScrollbar.java
-share/webmin/proc/CbScrollbarArrow.class
-share/webmin/proc/CbScrollbarCallback.class
-share/webmin/proc/LineInputStream.class
-share/webmin/proc/LineInputStream.java
-share/webmin/proc/Makefile
-share/webmin/proc/MultiColumn.class
-share/webmin/proc/MultiColumn.java
-share/webmin/proc/MultiColumnCallback.class
-share/webmin/proc/StringJoiner.class
-share/webmin/proc/StringSplitter.class
-share/webmin/proc/StringSplitter.java
-share/webmin/proc/Tracer.class
-share/webmin/proc/Tracer.java
-share/webmin/proc/Util.class
-share/webmin/proc/Util.java
-share/webmin/proc/acl_security.pl
-share/webmin/proc/config-*-linux
-share/webmin/proc/config-aix
-share/webmin/proc/config-dragonfly
-share/webmin/proc/config-freebsd
-share/webmin/proc/config-hpux
-share/webmin/proc/config-irix
-share/webmin/proc/config-macos
-share/webmin/proc/config-netbsd
-share/webmin/proc/config-openbsd
-share/webmin/proc/config-openserver
-share/webmin/proc/config-osf1
-share/webmin/proc/config-solaris
-share/webmin/proc/config-unixware
-share/webmin/proc/config-windows
-share/webmin/proc/config.info
-share/webmin/proc/config.info.ca
-share/webmin/proc/config.info.de
-share/webmin/proc/config.info.es
-share/webmin/proc/config.info.fa
-share/webmin/proc/config.info.fr
-share/webmin/proc/config.info.hu
-share/webmin/proc/config.info.it
-share/webmin/proc/config.info.pl
-share/webmin/proc/config.info.ru_RU
-share/webmin/proc/config.info.ru_SU
-share/webmin/proc/config.info.sv
-share/webmin/proc/config.info.tr
-share/webmin/proc/config.info.uk_UA
-share/webmin/proc/config.info.zh_CN
-share/webmin/proc/config.info.zh_CN.UTF-8
-share/webmin/proc/config.info.zh_TW.Big5
-share/webmin/proc/config.info.zh_TW.UTF-8
-share/webmin/proc/cpan_modules.pl
-share/webmin/proc/defaultacl
 share/webmin/proc/edit_proc.cgi
-share/webmin/proc/freebsd-lib.pl
-share/webmin/proc/help/cmd.ca.html
-share/webmin/proc/help/cmd.es.html
-share/webmin/proc/help/cmd.fr.html
-share/webmin/proc/help/cmd.html
-share/webmin/proc/help/cmd.hu.html
-share/webmin/proc/help/cmd.pl.html
-share/webmin/proc/help/cmd.sv.html
-share/webmin/proc/help/cmd.zh_TW.Big5.html
-share/webmin/proc/help/cmd.zh_TW.UTF-8.html
-share/webmin/proc/help/cpu.ca.html
-share/webmin/proc/help/cpu.es.html
-share/webmin/proc/help/cpu.fr.html
-share/webmin/proc/help/cpu.html
-share/webmin/proc/help/cpu.hu.html
-share/webmin/proc/help/cpu.pl.html
-share/webmin/proc/help/cpu.sv.html
-share/webmin/proc/help/cpu.zh_TW.Big5.html
-share/webmin/proc/help/cpu.zh_TW.UTF-8.html
-share/webmin/proc/help/edit_proc.ca.html
-share/webmin/proc/help/edit_proc.es.html
-share/webmin/proc/help/edit_proc.fr.html
-share/webmin/proc/help/edit_proc.html
-share/webmin/proc/help/edit_proc.hu.html
-share/webmin/proc/help/edit_proc.pl.html
-share/webmin/proc/help/edit_proc.sv.html
-share/webmin/proc/help/edit_proc.zh_TW.Big5.html
-share/webmin/proc/help/edit_proc.zh_TW.UTF-8.html
-share/webmin/proc/help/input.ca.html
-share/webmin/proc/help/input.es.html
-share/webmin/proc/help/input.fr.html
-share/webmin/proc/help/input.html
-share/webmin/proc/help/input.hu.html
-share/webmin/proc/help/input.pl.html
-share/webmin/proc/help/input.sv.html
-share/webmin/proc/help/input.zh_TW.Big5.html
-share/webmin/proc/help/input.zh_TW.UTF-8.html
-share/webmin/proc/help/intro.ca.html
-share/webmin/proc/help/intro.es.html
-share/webmin/proc/help/intro.fr.html
-share/webmin/proc/help/intro.html
-share/webmin/proc/help/intro.hu.html
-share/webmin/proc/help/intro.pl.html
-share/webmin/proc/help/intro.sv.html
-share/webmin/proc/help/intro.zh_TW.Big5.html
-share/webmin/proc/help/intro.zh_TW.UTF-8.html
-share/webmin/proc/help/mode.ca.html
-share/webmin/proc/help/mode.es.html
-share/webmin/proc/help/mode.fr.html
-share/webmin/proc/help/mode.html
-share/webmin/proc/help/mode.hu.html
-share/webmin/proc/help/mode.pl.html
-share/webmin/proc/help/mode.sv.html
-share/webmin/proc/help/mode.zh_TW.Big5.html
-share/webmin/proc/help/mode.zh_TW.UTF-8.html
-share/webmin/proc/help/nice.ca.html
-share/webmin/proc/help/nice.es.html
-share/webmin/proc/help/nice.fr.html
-share/webmin/proc/help/nice.html
-share/webmin/proc/help/nice.hu.html
-share/webmin/proc/help/nice.pl.html
-share/webmin/proc/help/nice.sv.html
-share/webmin/proc/help/nice.zh_TW.Big5.html
-share/webmin/proc/help/nice.zh_TW.UTF-8.html
-share/webmin/proc/help/open_proc.ca.html
-share/webmin/proc/help/open_proc.html
-share/webmin/proc/help/overview.ca.html
-share/webmin/proc/help/overview.es.html
-share/webmin/proc/help/overview.fr.html
-share/webmin/proc/help/overview.html
-share/webmin/proc/help/overview.hu.html
-share/webmin/proc/help/overview.pl.html
-share/webmin/proc/help/overview.sv.html
-share/webmin/proc/help/overview.zh_TW.Big5.html
-share/webmin/proc/help/overview.zh_TW.UTF-8.html
-share/webmin/proc/help/run.ca.html
-share/webmin/proc/help/run.es.html
-share/webmin/proc/help/run.fr.html
-share/webmin/proc/help/run.html
-share/webmin/proc/help/run.hu.html
-share/webmin/proc/help/run.pl.html
-share/webmin/proc/help/run.sv.html
-share/webmin/proc/help/run.zh_TW.Big5.html
-share/webmin/proc/help/run.zh_TW.UTF-8.html
-share/webmin/proc/help/scpu.ca.html
-share/webmin/proc/help/scpu.es.html
-share/webmin/proc/help/scpu.fr.html
-share/webmin/proc/help/scpu.html
-share/webmin/proc/help/scpu.hu.html
-share/webmin/proc/help/scpu.pl.html
-share/webmin/proc/help/scpu.sv.html
-share/webmin/proc/help/scpu.zh_TW.Big5.html
-share/webmin/proc/help/scpu.zh_TW.UTF-8.html
-share/webmin/proc/help/search.ca.html
-share/webmin/proc/help/search.es.html
-share/webmin/proc/help/search.fr.html
-share/webmin/proc/help/search.html
-share/webmin/proc/help/search.hu.html
-share/webmin/proc/help/search.pl.html
-share/webmin/proc/help/search.sv.html
-share/webmin/proc/help/search.zh_TW.Big5.html
-share/webmin/proc/help/search.zh_TW.UTF-8.html
-share/webmin/proc/help/sfiles.ca.html
-share/webmin/proc/help/sfiles.es.html
-share/webmin/proc/help/sfiles.fr.html
-share/webmin/proc/help/sfiles.html
-share/webmin/proc/help/sfiles.hu.html
-share/webmin/proc/help/sfiles.pl.html
-share/webmin/proc/help/sfiles.sv.html
-share/webmin/proc/help/sfiles.zh_TW.Big5.html
-share/webmin/proc/help/sfiles.zh_TW.UTF-8.html
-share/webmin/proc/help/sfs.ca.html
-share/webmin/proc/help/sfs.es.html
-share/webmin/proc/help/sfs.fr.html
-share/webmin/proc/help/sfs.html
-share/webmin/proc/help/sfs.hu.html
-share/webmin/proc/help/sfs.pl.html
-share/webmin/proc/help/sfs.sv.html
-share/webmin/proc/help/sfs.zh_TW.Big5.html
-share/webmin/proc/help/sfs.zh_TW.UTF-8.html
-share/webmin/proc/help/signore.ca.html
-share/webmin/proc/help/signore.es.html
-share/webmin/proc/help/signore.html
-share/webmin/proc/help/signore.pl.html
-share/webmin/proc/help/sip.ca.html
-share/webmin/proc/help/sip.html
-share/webmin/proc/help/size.ca.html
-share/webmin/proc/help/size.es.html
-share/webmin/proc/help/size.fr.html
-share/webmin/proc/help/size.html
-share/webmin/proc/help/size.hu.html
-share/webmin/proc/help/size.pl.html
-share/webmin/proc/help/size.sv.html
-share/webmin/proc/help/size.zh_TW.Big5.html
-share/webmin/proc/help/size.zh_TW.UTF-8.html
-share/webmin/proc/help/smatch.ca.html
-share/webmin/proc/help/smatch.es.html
-share/webmin/proc/help/smatch.fr.html
-share/webmin/proc/help/smatch.html
-share/webmin/proc/help/smatch.hu.html
-share/webmin/proc/help/smatch.pl.html
-share/webmin/proc/help/smatch.sv.html
-share/webmin/proc/help/smatch.zh_TW.Big5.html
-share/webmin/proc/help/smatch.zh_TW.UTF-8.html
-share/webmin/proc/help/ssocket.ca.html
-share/webmin/proc/help/ssocket.es.html
-share/webmin/proc/help/ssocket.html
-share/webmin/proc/help/suser.ca.html
-share/webmin/proc/help/suser.es.html
-share/webmin/proc/help/suser.fr.html
-share/webmin/proc/help/suser.html
-share/webmin/proc/help/suser.hu.html
-share/webmin/proc/help/suser.pl.html
-share/webmin/proc/help/suser.sv.html
-share/webmin/proc/help/suser.zh_TW.Big5.html
-share/webmin/proc/help/suser.zh_TW.UTF-8.html
-share/webmin/proc/help/trace.ca.html
-share/webmin/proc/help/trace.html
-share/webmin/proc/help/tree.ca.html
-share/webmin/proc/help/tree.es.html
-share/webmin/proc/help/tree.fr.html
-share/webmin/proc/help/tree.html
-share/webmin/proc/help/tree.hu.html
-share/webmin/proc/help/tree.pl.html
-share/webmin/proc/help/tree.sv.html
-share/webmin/proc/help/tree.zh_TW.Big5.html
-share/webmin/proc/help/tree.zh_TW.UTF-8.html
-share/webmin/proc/help/user.ca.html
-share/webmin/proc/help/user.es.html
-share/webmin/proc/help/user.fr.html
-share/webmin/proc/help/user.html
-share/webmin/proc/help/user.hu.html
-share/webmin/proc/help/user.pl.html
-share/webmin/proc/help/user.sv.html
-share/webmin/proc/help/user.zh_TW.Big5.html
-share/webmin/proc/help/user.zh_TW.UTF-8.html
-share/webmin/proc/help/zone.ca.html
-share/webmin/proc/help/zone.html
-share/webmin/proc/hpux-lib.pl
-share/webmin/proc/images/icon.gif
-share/webmin/proc/images/smallicon.gif
 share/webmin/proc/index.cgi
 share/webmin/proc/index_cpu.cgi
 share/webmin/proc/index_run.cgi
@@ -1074,163 +151,34 @@ share/webmin/proc/index_zone.cgi
 share/webmin/proc/kill_proc.cgi
 share/webmin/proc/kill_proc_list.cgi
 share/webmin/proc/killtail.cgi
-share/webmin/proc/lang/ca
-share/webmin/proc/lang/de
-share/webmin/proc/lang/en
-share/webmin/proc/lang/es
-share/webmin/proc/lang/fa
-share/webmin/proc/lang/fr
-share/webmin/proc/lang/hu
-share/webmin/proc/lang/it
-share/webmin/proc/lang/ja_JP.UTF-8
-share/webmin/proc/lang/ja_JP.euc
-share/webmin/proc/lang/ko_KR.UTF-8
-share/webmin/proc/lang/ko_KR.euc
-share/webmin/proc/lang/pl
-share/webmin/proc/lang/pt
-share/webmin/proc/lang/ru_RU
-share/webmin/proc/lang/ru_SU
-share/webmin/proc/lang/sv
-share/webmin/proc/lang/tr
-share/webmin/proc/lang/uk_UA
-share/webmin/proc/lang/zh_CN
-share/webmin/proc/lang/zh_CN.UTF-8
-share/webmin/proc/lang/zh_TW.Big5
-share/webmin/proc/lang/zh_TW.UTF-8
-share/webmin/proc/linux-lib.pl
-share/webmin/proc/log_parser.pl
-share/webmin/proc/low.skill
-share/webmin/proc/macos-lib.pl
-share/webmin/proc/medium.risk
-share/webmin/proc/medium.skill
-share/webmin/proc/module.info
 share/webmin/proc/open_files.cgi
-share/webmin/proc/openbsd-lib.pl
-share/webmin/proc/osf-lib.pl
-share/webmin/proc/proc-lib.pl
-share/webmin/proc/rbac-mapping
 share/webmin/proc/renice_proc.cgi
 share/webmin/proc/run.cgi
-share/webmin/proc/syslog_logs.pl
-share/webmin/proc/sysv-lib.pl
 share/webmin/proc/tail.cgi
 share/webmin/proc/trace.cgi
-share/webmin/proc/windows-lib.pl
+share/webmin/record-login.pl
+share/webmin/record-logout.pl
 share/webmin/rpc.cgi
 share/webmin/run-postinstalls.pl
 share/webmin/run-uninstalls.pl
-share/webmin/servers/CHANGELOG
-share/webmin/servers/acl_security.pl
 share/webmin/servers/auto.pl
-share/webmin/servers/config
-share/webmin/servers/config.info
-share/webmin/servers/config.info.ca
-share/webmin/servers/config.info.cz
-share/webmin/servers/config.info.de
-share/webmin/servers/config.info.es
-share/webmin/servers/config.info.fr
-share/webmin/servers/config.info.hu
-share/webmin/servers/config.info.ko_KR.euc
-share/webmin/servers/config.info.ms
-share/webmin/servers/config.info.no
-share/webmin/servers/config.info.pl
-share/webmin/servers/config.info.pt_BR
-share/webmin/servers/config.info.sk
-share/webmin/servers/config.info.sv
-share/webmin/servers/config.info.tr
-share/webmin/servers/config.info.zh_CN
-share/webmin/servers/config.info.zh_CN.UTF-8
-share/webmin/servers/config.info.zh_TW.Big5
-share/webmin/servers/config.info.zh_TW.UTF-8
-share/webmin/servers/config_info.pl
-share/webmin/servers/defaultacl
 share/webmin/servers/delete_servs.cgi
 share/webmin/servers/edit_auto.cgi
 share/webmin/servers/edit_serv.cgi
-share/webmin/servers/feedback_files.pl
 share/webmin/servers/find.cgi
-share/webmin/servers/images/asianux.gif
-share/webmin/servers/images/caldera.gif
-share/webmin/servers/images/centos.gif
-share/webmin/servers/images/cobalt.gif
-share/webmin/servers/images/debian.gif
-share/webmin/servers/images/fedora.gif
-share/webmin/servers/images/freebsd.gif
-share/webmin/servers/images/hpux.gif
-share/webmin/servers/images/icon.gif
-share/webmin/servers/images/irix.gif
-share/webmin/servers/images/linux.gif
-share/webmin/servers/images/mac.gif
-share/webmin/servers/images/mandrake.gif
-share/webmin/servers/images/msc.gif
-share/webmin/servers/images/openbsd.gif
-share/webmin/servers/images/redflag.gif
-share/webmin/servers/images/redhat.gif
-share/webmin/servers/images/sco.gif
-share/webmin/servers/images/slackware.gif
-share/webmin/servers/images/smallicon.gif
-share/webmin/servers/images/solaris.gif
-share/webmin/servers/images/suse.gif
-share/webmin/servers/images/turbo.gif
-share/webmin/servers/images/ubuntu.gif
-share/webmin/servers/images/unknown.gif
-share/webmin/servers/images/windows.gif
 share/webmin/servers/index.cgi
-share/webmin/servers/lang/ca
-share/webmin/servers/lang/cz
-share/webmin/servers/lang/de
-share/webmin/servers/lang/en
-share/webmin/servers/lang/es
-share/webmin/servers/lang/fr
-share/webmin/servers/lang/hu
-share/webmin/servers/lang/ja_JP.UTF-8
-share/webmin/servers/lang/ja_JP.euc
-share/webmin/servers/lang/ko_KR.UTF-8
-share/webmin/servers/lang/ko_KR.euc
-share/webmin/servers/lang/ms
-share/webmin/servers/lang/no
-share/webmin/servers/lang/pl
-share/webmin/servers/lang/pt
-share/webmin/servers/lang/ru_RU
-share/webmin/servers/lang/ru_SU
-share/webmin/servers/lang/sk
-share/webmin/servers/lang/sv
-share/webmin/servers/lang/tr
-share/webmin/servers/lang/uk_UA
-share/webmin/servers/lang/zh_CN
-share/webmin/servers/lang/zh_CN.UTF-8
-share/webmin/servers/lang/zh_TW.Big5
-share/webmin/servers/lang/zh_TW.UTF-8
 share/webmin/servers/link.cgi
-share/webmin/servers/log_parser.pl
 share/webmin/servers/login.cgi
 share/webmin/servers/logout.cgi
-share/webmin/servers/module.info
 share/webmin/servers/save_auto.cgi
 share/webmin/servers/save_serv.cgi
-share/webmin/servers/servers-lib.pl
-share/webmin/servers/uninstall.pl
 share/webmin/session_login.cgi
 share/webmin/setup-pre.sh
 share/webmin/setup.pl
-share/webmin/setup.sh
 share/webmin/switch_skill.cgi
 share/webmin/switch_user.cgi
-share/webmin/thirdparty.pl
-share/webmin/ui-lib.pl
 share/webmin/uptracker.cgi
 share/webmin/user_chooser.cgi
-share/webmin/version
-share/webmin/web-lib-funcs.pl
-share/webmin/web-lib.pl
-share/webmin/webmin-caldera-init
-share/webmin/webmin-daemon
-share/webmin/webmin-gentoo-init
-share/webmin/webmin-init
-share/webmin/webmin-pam
-share/webmin/webmin/CHANGELOG
-share/webmin/webmin/adminupgrade
-share/webmin/webmin/backup_config.pl
 share/webmin/webmin/bootup.cgi
 share/webmin/webmin/cache.cgi
 share/webmin/webmin/change_access.cgi
@@ -1238,38 +186,26 @@ share/webmin/webmin/change_advanced.cgi
 share/webmin/webmin/change_anon.cgi
 share/webmin/webmin/change_bind.cgi
 share/webmin/webmin/change_ca.cgi
+share/webmin/webmin/change_debug.cgi
 share/webmin/webmin/change_lang.cgi
 share/webmin/webmin/change_lock.cgi
 share/webmin/webmin/change_log.cgi
 share/webmin/webmin/change_mobile.cgi
 share/webmin/webmin/change_os.cgi
 share/webmin/webmin/change_osdn.cgi
+share/webmin/webmin/change_overlay.cgi
 share/webmin/webmin/change_proxy.cgi
 share/webmin/webmin/change_referers.cgi
 share/webmin/webmin/change_session.cgi
 share/webmin/webmin/change_ssl.cgi
 share/webmin/webmin/change_startpage.cgi
+share/webmin/webmin/change_status.cgi
 share/webmin/webmin/change_syslet.cgi
 share/webmin/webmin/change_theme.cgi
 share/webmin/webmin/change_ui.cgi
+share/webmin/webmin/clear_blocked.cgi
 share/webmin/webmin/clear_cache.cgi
 share/webmin/webmin/clone_mod.cgi
-share/webmin/webmin/config
-share/webmin/webmin/config.info
-share/webmin/webmin/config.info.ca
-share/webmin/webmin/config.info.de
-share/webmin/webmin/config.info.es
-share/webmin/webmin/config.info.fa
-share/webmin/webmin/config.info.fr
-share/webmin/webmin/config.info.ja_JP.UTF-8
-share/webmin/webmin/config.info.ja_JP.euc
-share/webmin/webmin/config.info.ko_KR.euc
-share/webmin/webmin/config.info.ms
-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
@@ -1281,6 +217,7 @@ 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_debug.cgi
 share/webmin/webmin/edit_descs.cgi
 share/webmin/webmin/edit_ipkey.cgi
 share/webmin/webmin/edit_lang.cgi
@@ -1291,244 +228,43 @@ share/webmin/webmin/edit_mods.cgi
 share/webmin/webmin/edit_os.cgi
 share/webmin/webmin/edit_proxy.cgi
 share/webmin/webmin/edit_referers.cgi
+share/webmin/webmin/edit_sendmail.cgi
 share/webmin/webmin/edit_session.cgi
 share/webmin/webmin/edit_ssl.cgi
 share/webmin/webmin/edit_startpage.cgi
+share/webmin/webmin/edit_status.cgi
 share/webmin/webmin/edit_syslet.cgi
 share/webmin/webmin/edit_themes.cgi
 share/webmin/webmin/edit_ui.cgi
 share/webmin/webmin/edit_upgrade.cgi
 share/webmin/webmin/export_mod.cgi
-share/webmin/webmin/feedback_files.pl
 share/webmin/webmin/fix_os.cgi
-share/webmin/webmin/gnupg-lib.pl
-share/webmin/webmin/images/access.gif
-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
-share/webmin/webmin/images/icon.gif
-share/webmin/webmin/images/lang.gif
-share/webmin/webmin/images/lock.gif
-share/webmin/webmin/images/log.gif
-share/webmin/webmin/images/mobile.gif
-share/webmin/webmin/images/mods.gif
-share/webmin/webmin/images/os.gif
-share/webmin/webmin/images/proxy.gif
-share/webmin/webmin/images/referers.gif
-share/webmin/webmin/images/session.gif
-share/webmin/webmin/images/smallicon.gif
-share/webmin/webmin/images/ssl.gif
-share/webmin/webmin/images/startpage.gif
-share/webmin/webmin/images/syslet.gif
-share/webmin/webmin/images/themes.gif
-share/webmin/webmin/images/ui.gif
-share/webmin/webmin/images/upgrade.gif
 share/webmin/webmin/index.cgi
 share/webmin/webmin/install_mod.cgi
 share/webmin/webmin/install_theme.cgi
-share/webmin/webmin/jcameron-key.asc
-share/webmin/webmin/lang/ca
-share/webmin/webmin/lang/cz
-share/webmin/webmin/lang/de
-share/webmin/webmin/lang/en
-share/webmin/webmin/lang/es
-share/webmin/webmin/lang/fa
-share/webmin/webmin/lang/fr
-share/webmin/webmin/lang/he
-share/webmin/webmin/lang/hu
-share/webmin/webmin/lang/it
-share/webmin/webmin/lang/ja_JP.UTF-8
-share/webmin/webmin/lang/ja_JP.euc
-share/webmin/webmin/lang/ko_KR.UTF-8
-share/webmin/webmin/lang/ko_KR.euc
-share/webmin/webmin/lang/ms
-share/webmin/webmin/lang/nl
-share/webmin/webmin/lang/no
-share/webmin/webmin/lang/pl
-share/webmin/webmin/lang/pt
-share/webmin/webmin/lang/pt_BR
-share/webmin/webmin/lang/ru_RU
-share/webmin/webmin/lang/ru_SU
-share/webmin/webmin/lang/sk
-share/webmin/webmin/lang/sv
-share/webmin/webmin/lang/tr
-share/webmin/webmin/lang/uk_UA
-share/webmin/webmin/lang/zh_CN
-share/webmin/webmin/lang/zh_CN.UTF-8
-share/webmin/webmin/lang/zh_TW.Big5
-share/webmin/webmin/lang/zh_TW.UTF-8
-share/webmin/webmin/log_parser.pl
-share/webmin/webmin/low.skill
-share/webmin/webmin/medium.skill
-share/webmin/webmin/module.info
 share/webmin/webmin/newkey.cgi
+share/webmin/webmin/refresh_modules.cgi
 share/webmin/webmin/restart.cgi
 share/webmin/webmin/save_assignment.cgi
 share/webmin/webmin/save_categories.cgi
 share/webmin/webmin/save_descs.cgi
 share/webmin/webmin/save_ipkey.cgi
 share/webmin/webmin/save_newmod.cgi
+share/webmin/webmin/save_sendmail.cgi
 share/webmin/webmin/savekey.cgi
 share/webmin/webmin/setup_ca.cgi
 share/webmin/webmin/standard_chooser.cgi
 share/webmin/webmin/stop_ca.cgi
 share/webmin/webmin/subdir/foo.cgi
 share/webmin/webmin/submit.cgi
-share/webmin/webmin/syslog_logs.pl
 share/webmin/webmin/third_chooser.cgi
-share/webmin/webmin/uninstall.pl
 share/webmin/webmin/update.cgi
 share/webmin/webmin/update.pl
 share/webmin/webmin/update_sched.cgi
 share/webmin/webmin/upgrade.cgi
-share/webmin/webmin/webmin-lib.pl
-share/webmin/webminlog/CHANGELOG
-share/webmin/webminlog/acl_security.pl
-share/webmin/webminlog/config
-share/webmin/webminlog/config.info
-share/webmin/webminlog/config.info.ca
-share/webmin/webminlog/config.info.de
-share/webmin/webminlog/config.info.es
-share/webmin/webminlog/config.info.hu
-share/webmin/webminlog/config.info.ko_KR.euc
-share/webmin/webminlog/config.info.sk
-share/webmin/webminlog/config.info.tr
-share/webmin/webminlog/defaultacl
-share/webmin/webminlog/images/icon.gif
-share/webmin/webminlog/images/smallicon.gif
+share/webmin/webmin_search.cgi
 share/webmin/webminlog/index.cgi
-share/webmin/webminlog/lang/ca
-share/webmin/webminlog/lang/de
-share/webmin/webminlog/lang/en
-share/webmin/webminlog/lang/es
-share/webmin/webminlog/lang/fr
-share/webmin/webminlog/lang/hu
-share/webmin/webminlog/lang/it
-share/webmin/webminlog/lang/ja_JP.UTF-8
-share/webmin/webminlog/lang/ja_JP.euc
-share/webmin/webminlog/lang/ko_KR.UTF-8
-share/webmin/webminlog/lang/ko_KR.euc
-share/webmin/webminlog/lang/ms
-share/webmin/webminlog/lang/nl
-share/webmin/webminlog/lang/no
-share/webmin/webminlog/lang/pl
-share/webmin/webminlog/lang/pt_BR
-share/webmin/webminlog/lang/ru_RU
-share/webmin/webminlog/lang/ru_SU
-share/webmin/webminlog/lang/sk
-share/webmin/webminlog/lang/sv
-share/webmin/webminlog/lang/tr
-share/webmin/webminlog/lang/uk_UA
-share/webmin/webminlog/lang/zh_CN
-share/webmin/webminlog/lang/zh_CN.UTF-8
-share/webmin/webminlog/lang/zh_TW.Big5
-share/webmin/webminlog/lang/zh_TW.UTF-8
-share/webmin/webminlog/log_parser.pl
-share/webmin/webminlog/module.info
 share/webmin/webminlog/rollback.cgi
 share/webmin/webminlog/search.cgi
 share/webmin/webminlog/view.cgi
-share/webmin/webminlog/webminlog-lib.pl
 share/webmin/xmlrpc.cgi
-share/webmin/cron/config-macos-9.2-*
-share/webmin/cron/config.info.hr
-share/webmin/cron/config.info.it
-share/webmin/cron/lang/hr
-share/webmin/images/bar-blue.gif
-share/webmin/images/bar-grey.gif
-share/webmin/images/bar-purple.gif
-share/webmin/images/bar-red.gif
-share/webmin/images/bar-white.gif
-share/webmin/images/down.gif
-share/webmin/images/gap.gif
-share/webmin/images/movedown.gif
-share/webmin/images/movegap.gif
-share/webmin/images/moveup.gif
-share/webmin/images/up.gif
-share/webmin/images/webmin-blue.png
-share/webmin/images/webmin-blue.svg
-share/webmin/init/config.info.cz
-share/webmin/init/config.info.ko_KR.UTF-8
-share/webmin/init/config.info.ko_KR.euc
-share/webmin/init/config.info.nl
-share/webmin/init/help/help.ko_KR.UTF-8.html
-share/webmin/init/help/help.ko_KR.euc.html
-share/webmin/init/help/proc.ko_KR.UTF-8.html
-share/webmin/init/help/proc.ko_KR.euc.html
-share/webmin/init/lang/cz
-share/webmin/init/lang/nl
-share/webmin/inittab/config.info.cz
-share/webmin/inittab/config.info.ko_KR.UTF-8
-share/webmin/inittab/config.info.nl
-share/webmin/inittab/lang/cz
-share/webmin/inittab/lang/nl
-share/webmin/lang/el
-share/webmin/man/config.info.cz
-share/webmin/man/config.info.nl
-share/webmin/man/lang/nl
-share/webmin/proc/config.info.cz
-share/webmin/proc/config.info.ja_JP.UTF-8
-share/webmin/proc/config.info.ja_JP.euc
-share/webmin/proc/config.info.nl
-share/webmin/proc/help/cmd.it.html
-share/webmin/proc/help/cpu.it.html
-share/webmin/proc/help/edit_proc.it.html
-share/webmin/proc/help/input.it.html
-share/webmin/proc/help/intro.it.html
-share/webmin/proc/help/mode.it.html
-share/webmin/proc/help/nice.it.html
-share/webmin/proc/help/open_proc.it.html
-share/webmin/proc/help/overview.it.html
-share/webmin/proc/help/run.it.html
-share/webmin/proc/help/sclass.ca.html
-share/webmin/proc/help/sclass.html
-share/webmin/proc/help/scpu.it.html
-share/webmin/proc/help/search.it.html
-share/webmin/proc/help/sfiles.it.html
-share/webmin/proc/help/sfs.it.html
-share/webmin/proc/help/signore.it.html
-share/webmin/proc/help/sip.it.html
-share/webmin/proc/help/size.it.html
-share/webmin/proc/help/smatch.it.html
-share/webmin/proc/help/sprio.ca.html
-share/webmin/proc/help/sprio.html
-share/webmin/proc/help/ssocket.it.html
-share/webmin/proc/help/suser.it.html
-share/webmin/proc/help/trace.it.html
-share/webmin/proc/help/tree.it.html
-share/webmin/proc/help/user.it.html
-share/webmin/proc/help/zone.it.html
-share/webmin/proc/lang/cz
-share/webmin/proc/lang/nl
-share/webmin/servers/backup_config.pl
-share/webmin/servers/config.info.it
-share/webmin/servers/config.info.ja_JP.UTF-8
-share/webmin/servers/config.info.ko_KR.UTF-8
-share/webmin/servers/config.info.nl
-share/webmin/servers/lang/it
-share/webmin/servers/lang/nl
-share/webmin/webmin/change_debug.cgi
-share/webmin/webmin/change_overlay.cgi
-share/webmin/webmin/config.info.cz
-share/webmin/webmin/config.info.hr
-share/webmin/webmin/config.info.it
-share/webmin/webmin/config.info.ko_KR.UTF-8
-share/webmin/webmin/edit_debug.cgi
-share/webmin/webmin/images/debug.gif
-share/webmin/webmin/lang/en_GB
-share/webmin/webmin/lang/hr
-share/webmin/webmin/postinstall.pl
-share/webmin/webmin/refresh_modules.cgi
-share/webmin/webmin_search.cgi
-share/webmin/webminlog/config.info.cz
-share/webmin/webminlog/config.info.hr
-share/webmin/webminlog/config.info.ko_KR.UTF-8
-share/webmin/webminlog/config.info.nl
-share/webmin/webminlog/images/star.gif
-share/webmin/webminlog/lang/cz
-share/webmin/webminlog/lang/hr
Index: webmin/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- webmin/distinfo     9 Apr 2009 10:15:01 -0000       1.17
+++ webmin/distinfo     16 Jun 2011 07:57:24 -0000
@@ -1,29 +1,29 @@
-$NetBSD: distinfo,v 1.17 2009/04/09 10:15:01 kefren Exp $
+$NetBSD: distinfo,v 1.16 2008/07/25 02:55:27 tonnerre Exp $
 
-SHA1 (webmin-1.470.tar.gz) = ace7931c33495fb9a1c76500060feb7019d6acbf
-RMD160 (webmin-1.470.tar.gz) = 58acf6703c6469850837796b2e0cbcdb258cf07f
-Size (webmin-1.470.tar.gz) = 14105863 bytes
-SHA1 (patch-aa) = e1dadeb9bb59a9fd040a0befa1ac06ac20fe4fbf
+SHA1 (webmin-1.550.tar.gz) = 3f8a33a1e52d2c8d897bd3f00acb1896933bc3af
+RMD160 (webmin-1.550.tar.gz) = 12465dd959c76cf8501123cc6f2d09e9dd0c7ec1
+Size (webmin-1.550.tar.gz) = 15102848 bytes
+SHA1 (patch-aa) = e1196764fefed872e84a76dc32b428c504920468
 SHA1 (patch-ab) = fa07200462df76af23b9952739388053940c6743
-SHA1 (patch-ac) = b69286454a8b07f6eb0aceee95ab1b3e396ceb45
-SHA1 (patch-ad) = cc629f057a8f7895a2ee9a5ffac071b6a52284e4
-SHA1 (patch-ae) = fcbee4c734f80d62bd9ea58af34e730529b86620
+SHA1 (patch-ac) = 8803482bd0ab02e3d70683a520a76c3dc680df6b
+SHA1 (patch-ad) = 588fddbc36c256a87a0e6b21f12951cb6e054ee5
+SHA1 (patch-ae) = b2b70ab748f6bb94e9a567097c874dbd67a8bc1d
 SHA1 (patch-af) = 24f130a985ab7d3bdfc7db8d82114e8b107f1574
-SHA1 (patch-ag) = a42266da672f6953b837a64185f8f2dfda3f11d1
-SHA1 (patch-ah) = 820af8ea032e1aa36684b157e9377a056086df25
-SHA1 (patch-ai) = fc4272323726fe15d7c7a96d70228976459721e6
+SHA1 (patch-ag) = 3b80e730524e8d7d6bf185328c4612ea86a56a89
+SHA1 (patch-ah) = 4a6f1d9ee4a8d1a74037ffd86abad6c168a0fbfa
+SHA1 (patch-ai) = b06b0fe269739cc1121da7588ace6903fcccf9ff
 SHA1 (patch-ak) = 201c124d8c407e0439b8531dfb4dacba37ce37bb
 SHA1 (patch-al) = b1382143d42af3ce5057368dc442ba9c2e6de259
 SHA1 (patch-am) = d61fed9c53870aad36651389a5d655f5b2d5c21f
 SHA1 (patch-an) = 4416c2586fc7a732b255d4787be1a3f93c23f32c
 SHA1 (patch-ao) = 007eba7b551fd3d154e470f82c1c15552481e9fa
-SHA1 (patch-ap) = 7b8c983770c7fd08b20de36b006e0f30ce1bce3e
+SHA1 (patch-ap) = 2cf02d0f1d1c725ecce0aba072d9f149bdf24e20
 SHA1 (patch-aq) = 52751d7ec0ce1ebb89aee977a752486372b80e36
 SHA1 (patch-ar) = 647703ab0281991cec015f2f6a6d191c70c0301e
 SHA1 (patch-as) = 65f246bfca5b077d15bf0e874d56792f08c93c03
 SHA1 (patch-au) = f0d0aaf6819f92fd96543246e7600054fb150d08
-SHA1 (patch-av) = c3a4096058a432863eb10a2b2d44184bc91f8926
-SHA1 (patch-aw) = 2d7738459ed4618b11558d31aef70a42f26c25be
-SHA1 (patch-ax) = 09f78731d35603e736b22a0f1e478103ca14cc4d
-SHA1 (patch-ay) = dd861b0e5710e3ccc6aabf49a1ac3baaa141dbf0
-SHA1 (patch-az) = 9860d1504397acbff90e4964aa8f9e505d853456
+SHA1 (patch-av) = c1b0b6a8dd4ee6c7fa226a77c4f3f081211cc619
+SHA1 (patch-aw) = a6f8b4c80222b4f659ebe11754d5e5cf981abf5a
+SHA1 (patch-ax) = e7debde036d736f641229b2b604b2d77b03c7366
+SHA1 (patch-ay) = 785deac9b90d0f628070724ad6b452dc34ce0643
+SHA1 (patch-az) = 8cb036cff6bcb4bdf271326b0457c79d4d5b52e4
Index: webmin/version.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/version.mk,v
retrieving revision 1.5
diff -u -p -r1.5 version.mk
--- webmin/version.mk   9 Apr 2009 10:15:01 -0000       1.5
+++ webmin/version.mk   16 Jun 2011 07:57:24 -0000
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.5 2009/04/09 10:15:01 kefren Exp $
+# $NetBSD: version.mk,v 1.4 2007/10/05 15:47:00 obache Exp $
 
-WBM_VERSION=   1.470
+WBM_VERSION=   1.550
Index: webmin/wbm.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/wbm.mk,v
retrieving revision 1.9
diff -u -p -r1.9 wbm.mk
--- webmin/wbm.mk       11 Jul 2010 17:41:01 -0000      1.9
+++ webmin/wbm.mk       16 Jun 2011 07:57:24 -0000
@@ -1,4 +1,4 @@
-# $NetBSD: wbm.mk,v 1.9 2010/07/11 17:41:01 joerg Exp $
+# $NetBSD: wbm.mk,v 1.8 2007/10/08 08:47:09 obache Exp $
 #
 # Makefile fragment for Webmin modules
 #
@@ -40,7 +40,7 @@ CATEGORIES+=  sysutils www
 MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE?=     http://www.webmin.com/standard.html
 
-USE_TOOLS+=    perl:run
+USE_TOOLS+=    perl:run perl
 DEPENDS+=      webmin>=${WBM_VERSION}:../../sysutils/webmin
 
 .for m in ${WBM_DEPEND_MODULES}
Index: webmin/files/setup-pre.sh
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/files/setup-pre.sh,v
retrieving revision 1.2
diff -u -p -r1.2 setup-pre.sh
--- webmin/files/setup-pre.sh   8 Oct 2007 08:47:09 -0000       1.2
+++ webmin/files/setup-pre.sh   16 Jun 2011 07:57:24 -0000
@@ -1,4 +1,4 @@
-# $NetBSD: setup-pre.sh,v 1.2 2007/10/08 08:47:09 obache Exp $
+# $NetBSD: setup-pre.sh,v 1.1 2006/05/16 04:01:28 jlam Exp $
 #
 # This shell script is sourced by webmin's setup.sh to provide local
 # overrides and defaults for configuration settings.
Index: webmin/files/wbm-deinstall.tmpl
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/files/wbm-deinstall.tmpl,v
retrieving revision 1.1
diff -u -p -r1.1 wbm-deinstall.tmpl
--- webmin/files/wbm-deinstall.tmpl     19 May 2006 17:14:53 -0000      1.1
+++ webmin/files/wbm-deinstall.tmpl     16 Jun 2011 07:57:24 -0000
@@ -1,4 +1,4 @@
-# $NetBSD: wbm-deinstall.tmpl,v 1.1 2006/05/19 17:14:53 jlam Exp $
+# $NetBSD$
 
 case "${STAGE}" in
 DEINSTALL)
Index: webmin/files/wbm-install.tmpl
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/files/wbm-install.tmpl,v
retrieving revision 1.1
diff -u -p -r1.1 wbm-install.tmpl
--- webmin/files/wbm-install.tmpl       8 Oct 2007 08:47:09 -0000       1.1
+++ webmin/files/wbm-install.tmpl       16 Jun 2011 07:57:24 -0000
@@ -1,4 +1,4 @@
-# $NetBSD: wbm-install.tmpl,v 1.1 2007/10/08 08:47:09 obache Exp $
+# $NetBSD$
 
 case "${STAGE}" in
 POST-INSTALL)
Index: webmin/files/webmin.sh
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/files/webmin.sh,v
retrieving revision 1.3
diff -u -p -r1.3 webmin.sh
--- webmin/files/webmin.sh      16 May 2006 04:01:28 -0000      1.3
+++ webmin/files/webmin.sh      16 Jun 2011 07:57:24 -0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: webmin.sh,v 1.3 2006/05/16 04:01:28 jlam Exp $
+# $NetBSD: webmin.sh,v 1.2 2005/01/23 04:36:27 jlam Exp $
 #
 
 # PROVIDE: webmin
Index: webmin/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-aa,v
retrieving revision 1.7
diff -u -p -r1.7 patch-aa
--- webmin/patches/patch-aa     9 Apr 2009 10:15:01 -0000       1.7
+++ webmin/patches/patch-aa     16 Jun 2011 07:57:24 -0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- setup.sh.orig      2009-03-18 07:30:26.000000000 +0200
 +++ setup.sh   2009-04-09 12:24:40.000000000 +0300
 @@ -35,6 +35,11 @@
Index: webmin/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-ac,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ac
--- webmin/patches/patch-ac     9 Apr 2009 10:15:01 -0000       1.4
+++ webmin/patches/patch-ac     16 Jun 2011 07:57:24 -0000
@@ -1,30 +1,32 @@
---- software/search.cgi.orig   2009-03-18 07:30:27.000000000 +0200
-+++ software/search.cgi        2009-04-09 12:27:58.000000000 +0300
-@@ -34,7 +34,7 @@
+$NetBSD$
+
+--- software/search.cgi.orig   2011-04-27 00:18:43.000000000 +0200
++++ software/search.cgi        2011-06-15 23:15:13.000000000 +0200
+@@ -34,7 +34,7 @@ if (@match == 1 && $in{'goto'}) {
  if (@match) {
        @match = sort { lc($packages{$a,'name'}) cmp lc($packages{$b,'name'}) }
                      @match;
 -      print "<b>",&text('search_match', "<tt>$s</tt>"),"</b><p>\n";
-+      print "<b>",&text('search_match', "<tt>" . &html_escape($s) . 
"</tt>"),"</b><p>\n";
++        print "<b>",&text('search_match', "<tt>" . &html_escape($s) . 
"</tt>"),"</b><p>\n";
        print &ui_form_start("delete_packs.cgi", "post");
        print &ui_hidden("search", $in{'search'});
        @tds = ( "width=5" );
-@@ -47,7 +47,8 @@
-                                 $text{'search_desc'} ], 100, 0, \@tds);
-       foreach $i (@match) {
+@@ -49,7 +49,8 @@ if (@match) {
                local @cols;
+               local $v = $packages{$i,'shortversion'} ||
+                          $packages{$i,'version'};
 -              push(@cols, "<a href=\"edit_pack.cgi?search=$s&package=".
-+              push(@cols, "<a href=\"edit_pack.cgi?search=" .
-+                      &urlize($s) . "&package=".
++                push(@cols, "<a href=\"edit_pack.cgi?search=" .
++                       &urlize($s) . "&package=".
                      &urlize($packages{$i,'name'})."&version=".
                      &urlize($packages{$i,'version'})."\">".&html_escape(
-                       $packages{$i,'name'}.($packages{$i,'version'} ?
-@@ -69,7 +70,7 @@
+                       $packages{$i,'name'}.($v ?  " $v" : ""))."</a>");
+@@ -70,7 +71,7 @@ if (@match) {
        print &ui_form_end([ [ undef, $text{'search_delete'} ] ]);
        }
  else {
 -      print "<b>",&text('search_nomatch', "<tt>$s</tt>"),"</b><p>\n";
-+      print "<b>",&text('search_nomatch', "<tt>" . &html_escape($s) . 
"</tt>"),"</b><p>\n";
++        print "<b>",&text('search_nomatch', "<tt>" . &html_escape($s) . 
"</tt>"),"</b><p>\n";
        }
  
  &ui_print_footer("", $text{'index_return'});
Index: webmin/patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-ad,v
retrieving revision 1.6
diff -u -p -r1.6 patch-ad
--- webmin/patches/patch-ad     9 Apr 2009 10:15:01 -0000       1.6
+++ webmin/patches/patch-ad     16 Jun 2011 07:57:25 -0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- os_list.txt.orig   2009-03-18 07:30:26.000000000 +0200
 +++ os_list.txt        2009-04-09 12:31:24.000000000 +0300
 @@ -255,19 +255,13 @@
Index: webmin/patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-ae,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ae
--- webmin/patches/patch-ae     9 Apr 2009 10:15:01 -0000       1.4
+++ webmin/patches/patch-ae     16 Jun 2011 07:57:25 -0000
@@ -1,11 +1,13 @@
---- man/module.info.orig       2009-03-18 07:30:39.000000000 +0200
-+++ man/module.info    2009-04-09 12:33:13.000000000 +0300
+$NetBSD$
+
+--- man/module.info.orig       2011-04-27 00:19:08.000000000 +0200
++++ man/module.info    2011-06-15 23:17:56.000000000 +0200
 @@ -9,7 +9,7 @@
  name=Man
  desc_tr=Kýlavuz Sayfalar
  desc_de=Systemdokumentation
--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
+-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 pardus-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 pardus-linux dragonfly
  desc_sk=Systémová dokumentácia
  desc_zh_CN=ʹÓÃÊÖ²á
  risk=low medium high
Index: webmin/patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-ag,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ag
--- webmin/patches/patch-ag     9 Apr 2009 10:15:01 -0000       1.3
+++ webmin/patches/patch-ag     16 Jun 2011 07:57:25 -0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- proc/module.info.orig      2009-03-18 07:30:39.000000000 +0200
 +++ proc/module.info   2009-04-09 12:34:49.000000000 +0300
 @@ -11,7 +11,7 @@
Index: webmin/patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-ah,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ah
--- webmin/patches/patch-ah     9 Apr 2009 10:15:01 -0000       1.4
+++ webmin/patches/patch-ah     16 Jun 2011 07:57:25 -0000
@@ -1,11 +1,13 @@
---- cron/module.info.orig      2009-03-18 07:30:40.000000000 +0200
-+++ cron/module.info   2009-04-09 12:35:58.000000000 +0300
+$NetBSD$
+
+--- cron/module.info.orig      2011-04-27 00:19:08.000000000 +0200
++++ cron/module.info   2011-06-15 23:19:12.000000000 +0200
 @@ -10,7 +10,7 @@
  name=Cron Manager
  desc_tr=Zamanlandýrýlmýþ Görevler
  desc_de=Geplante Auftr&#228;ge (Cron)
--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
+-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 pardus-linux
++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 pardus-linux dragonfly
  desc_sk=Cron Plánovaè úloh
  desc_zh_CN=Cron ÈÎÎñµ÷¶È
  risk=low medium high
Index: webmin/patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-ai,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ai
--- webmin/patches/patch-ai     9 Apr 2009 10:15:01 -0000       1.4
+++ webmin/patches/patch-ai     16 Jun 2011 07:57:25 -0000
@@ -1,11 +1,13 @@
---- init/module.info.orig      2009-03-18 07:30:40.000000000 +0200
-+++ init/module.info   2009-04-09 12:37:02.000000000 +0300
-@@ -22,7 +22,7 @@
- desc_ru_SU=úÁÇÒÕÚËÁ É ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ ÓÉÓÔÅÍÙ
+$NetBSD$
+
+--- init/module.info.orig      2011-04-27 00:19:08.000000000 +0200
++++ init/module.info   2011-06-15 23:20:14.000000000 +0200
+@@ -10,7 +10,7 @@
+ name=Boot Manager
  desc_tr=Açýlýþ ve Kapanýþ
  desc_de=System-Start und -Stop
--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
+-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 pardus-linux
++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 pardus-linux dragonfly
  desc_sk=©tart a vypnutie
- desc_ko_KR.euc=ºÎÆà ¹× Á¾·á 
  desc_zh_CN=Òýµ¼ºÍ¹Ø»ú
+ risk=low medium high
Index: webmin/patches/patch-ap
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-ap,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ap
--- webmin/patches/patch-ap     25 Jul 2008 02:55:27 -0000      1.1
+++ webmin/patches/patch-ap     16 Jun 2011 07:57:25 -0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-ap,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
+$NetBSD$
 
---- webminlog/search.cgi.orig  2007-09-21 23:26:52.000000000 +0200
-+++ webminlog/search.cgi
-@@ -91,7 +91,8 @@ $searchmsg = join(" ",
- if (@match) {
+--- webminlog/search.cgi.orig  2011-04-27 00:18:53.000000000 +0200
++++ webminlog/search.cgi       2011-06-15 23:34:38.000000000 +0200
+@@ -147,7 +147,8 @@ elsif (@match) {
+       # Show search results in table
        if ($in{'sid'}) {
                print "<b>",&text('search_sid', "<tt>$match[0]->{'user'}</tt>",
 -                                "<tt>$in{'sid'}</tt>")," ..</b><p>\n";
-+                                "<tt>" . &html_escape($in{'sid'}) . "</tt>"),
-+                                " ..</b><p>\n";
++                                 "<tt>" . &html_escape($in{'sid'}) . "</tt>"),
++                                 " ..</b><p>\n";
                }
        elsif ($in{'uall'} == 1 && $in{'mall'} && $in{'tall'}) {
                print "<b>$text{'search_critall'} ..</b><p>\n";
Index: webmin/patches/patch-av
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-av,v
retrieving revision 1.1
diff -u -p -r1.1 patch-av
--- webmin/patches/patch-av     25 Jul 2008 02:55:27 -0000      1.1
+++ webmin/patches/patch-av     16 Jun 2011 07:57:25 -0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-av,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
+$NetBSD$
 
---- ldap-useradmin/search_user.cgi.orig        2007-09-21 23:28:25.000000000 
+0200
-+++ ldap-useradmin/search_user.cgi
-@@ -23,8 +23,8 @@ elsif ($in{'match'} == 3) {
+--- ldap-useradmin/search_user.cgi.orig        2011-04-27 00:19:01.000000000 
+0200
++++ ldap-useradmin/search_user.cgi     2011-06-15 23:36:01.000000000 +0200
+@@ -24,8 +24,8 @@ elsif ($in{'match'} == 3) {
  $rv = $ldap->search(base => $base,
-                   filter => "(&(objectClass=posixAccount)$search)");
+                   filter => "(&".&user_filter().$search.")");
  if ($rv->code) {
 -      &error(&text('search_err', "<tt>$search</tt>",
 -                   "<tt>$base</tt>", $rv->error));
-+      &error(&text('search_err', "<tt>" . &html_escape($search) . "</tt>",
-+                   "<tt>" . &html_escape($base) . "</tt>", $rv->error));
++       &error(&text('search_err', "<tt>" . &html_escape($search) . "</tt>",
++                    "<tt>" . &html_escape($base) . "</tt>", $rv->error));
        }
  @users = $rv->all_entries;
  
Index: webmin/patches/patch-aw
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-aw,v
retrieving revision 1.1
diff -u -p -r1.1 patch-aw
--- webmin/patches/patch-aw     25 Jul 2008 02:55:27 -0000      1.1
+++ webmin/patches/patch-aw     16 Jun 2011 07:57:25 -0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-aw,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
+$NetBSD$
 
---- ldap-useradmin/search_group.cgi.orig       2007-09-21 23:28:25.000000000 
+0200
-+++ ldap-useradmin/search_group.cgi
-@@ -23,8 +23,8 @@ elsif ($in{'match'} == 3) {
+--- ldap-useradmin/search_group.cgi.orig       2011-04-27 00:19:01.000000000 
+0200
++++ ldap-useradmin/search_group.cgi    2011-06-15 23:37:06.000000000 +0200
+@@ -24,8 +24,8 @@ elsif ($in{'match'} == 3) {
  $rv = $ldap->search(base => $base,
-                   filter => "(&(objectClass=posixGroup)$search)");
+                   filter => "(&".&group_filter().$search.")");
  if ($rv->code) {
 -      &error(&text('search_err', "<tt>$search</tt>",
 -                   "<tt>$base</tt>", $rv->error));
-+      &error(&text('search_err', "<tt>" . &html_escape($search) . "</tt>",
-+                   "<tt>" . &html_escape($base) . "</tt>", $rv->error));
++       &error(&text('search_err', "<tt>" . &html_escape($search) . "</tt>",
++                    "<tt>" . &html_escape($base) . "</tt>", $rv->error));
        }
  @groups = $rv->all_entries;
  
Index: webmin/patches/patch-ax
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-ax,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ax
--- webmin/patches/patch-ax     25 Jul 2008 02:55:27 -0000      1.1
+++ webmin/patches/patch-ax     16 Jun 2011 07:57:25 -0000
@@ -1,48 +1,49 @@
-$NetBSD: patch-ax,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
+$NetBSD$
 
---- htaccess-htpasswd/search.cgi.orig  2007-09-21 23:28:30.000000000 +0200
-+++ htaccess-htpasswd/search.cgi
-@@ -19,7 +19,8 @@ $in{'search'} =~ /^\// && $in{'search'} 
+--- htaccess-htpasswd/search.cgi.orig  2011-04-27 00:19:02.000000000 +0200
++++ htaccess-htpasswd/search.cgi       2011-06-15 23:23:42.000000000 +0200
+@@ -19,7 +19,8 @@
  
  @dirs = &list_directories();
  %got = map { ( "$_->[0]/$config{'htaccess'}", 1 ) } @dirs;
 -print "<b>",&text('search_doing', "<tt>$in{'search'}</tt>"),"</b><p>\n";
 +print "<b>",&text('search_doing', "<tt>" . &html_escape($in{'search'}) .
-+      "</tt>"), "</b><p>\n";
++       "</tt>"), "</b><p>\n";
  
  # Use the find command
  &switch_user();
-@@ -28,24 +29,28 @@ open(FIND, "find ".quotemeta($in{'search
+@@ -28,10 +29,12 @@
  while($f = <FIND>) {
        chop($f);
        if ($got{$f}) {
 -              print &text('search_already', "<tt>$f</tt>"),"<br>\n";
-+              print &text('search_already', "<tt>" . &html_escape($f) .
-+                      "</tt>"),"<br>\n";
++               print &text('search_already', "<tt>" . &html_escape($f) .
++                       "</tt>"),"<br>\n";
                }
        elsif (!open(TEST, $f)) {
 -              print &text('search_open', "<tt>$f</tt>", $!),"<br>\n";
-+              print &text('search_open', "<tt>" . &html_escape($f) . "</tt>",
-+                      $!),"<br>\n";
++               print &text('search_open', "<tt>" . &html_escape($f) . "</tt>",
++                       $!),"<br>\n";
                }
        else {
                $conf = &foreign_call($apachemod, "get_htaccess_config", $f);
-               $currfile = &foreign_call($apachemod, "find_directive",
-                                         "AuthUserFile", $conf, 1);
-               if ($currfile) {
+@@ -40,14 +43,16 @@
+               $require = &foreign_call($apachemod, "find_directive",
+                                        "require", $conf, 1);
+               if ($currfile && $require) {
 -                      print &text('search_found', "<tt>$f</tt>",
 -                                  "<tt>$currfile</tt>"),"<br>\n";
-+                      print &text('search_found', "<tt>" . &html_escape($f) .
-+                              "</tt>", "<tt>" . &html_escape($currfile) .
-+                              "</tt>"),"<br>\n";
++                       print &text('search_found', "<tt>" . &html_escape($f) .
++                               "</tt>", "<tt>" . &html_escape($currfile) .
++                               "</tt>"),"<br>\n";
                        local $d = $f;
                        $d =~ s/\/$config{'htaccess'}$//;
                        push(@dirs, [ $d, $currfile ]);
                        }
                else {
 -                      print &text('search_noprot', "<tt>$f</tt>"),"<br>\n";
-+                      print &text('search_noprot', "<tt>" .
-+                              &html_escape($f) . "</tt>"),"<br>\n";
++                       print &text('search_noprot', "<tt>" .
++                               &html_escape($f) . "</tt>"),"<br>\n";
                        }
                }
        }
Index: webmin/patches/patch-ay
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-ay,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ay
--- webmin/patches/patch-ay     9 Apr 2009 10:15:01 -0000       1.2
+++ webmin/patches/patch-ay     16 Jun 2011 07:57:25 -0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- mailboxes/mail_search.cgi.orig     2009-03-18 07:30:35.000000000 +0200
 +++ mailboxes/mail_search.cgi  2009-04-09 12:43:30.000000000 +0300
 @@ -46,7 +46,8 @@
Index: webmin/patches/patch-az
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/webmin/patches/patch-az,v
retrieving revision 1.2
diff -u -p -r1.2 patch-az
--- webmin/patches/patch-az     9 Apr 2009 10:15:01 -0000       1.2
+++ webmin/patches/patch-az     16 Jun 2011 07:57:25 -0000
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- mailboxes/search_form.cgi.orig     2009-03-18 07:30:35.000000000 +0200
 +++ mailboxes/search_form.cgi  2009-04-09 12:47:29.000000000 +0300
 @@ -13,8 +13,8 @@


Home | Main Index | Thread Index | Old Index