Thu Apr 9 10:15:01 2009 UTC ()
blind update to 1.470
Changelist since 1.370 is too large to be included in this message
so please consult:

 http://www.webmin.com/changes-1.380.html
 http://www.webmin.com/changes-1.390.html
 http://www.webmin.com/changes-1.400.html
 http://www.webmin.com/changes-1.410.html
 http://www.webmin.com/changes-1.420.html
 http://www.webmin.com/changes-1.430.html
 http://www.webmin.com/changes-1.440.html
 http://www.webmin.com/changes-1.450.html
 http://www.webmin.com/changes-1.460.html
 http://www.webmin.com/changes-1.470.html


(kefren)
diff -r1.24 -r1.25 pkgsrc/sysutils/webmin/Makefile
diff -r1.10 -r1.11 pkgsrc/sysutils/webmin/PLIST
diff -r1.16 -r1.17 pkgsrc/sysutils/webmin/distinfo
diff -r1.4 -r1.5 pkgsrc/sysutils/webmin/version.mk
diff -r1.6 -r1.7 pkgsrc/sysutils/webmin/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/sysutils/webmin/patches/patch-ac
diff -r1.3 -r1.4 pkgsrc/sysutils/webmin/patches/patch-ae
diff -r1.3 -r1.4 pkgsrc/sysutils/webmin/patches/patch-ah
diff -r1.3 -r1.4 pkgsrc/sysutils/webmin/patches/patch-ai
diff -r1.5 -r1.6 pkgsrc/sysutils/webmin/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/sysutils/webmin/patches/patch-ag
diff -r1.1 -r0 pkgsrc/sysutils/webmin/patches/patch-aj
diff -r1.1 -r0 pkgsrc/sysutils/webmin/patches/patch-at
diff -r1.1 -r1.2 pkgsrc/sysutils/webmin/patches/patch-ay
diff -r1.1 -r1.2 pkgsrc/sysutils/webmin/patches/patch-az
cvs diff -r1.24 -r1.25 pkgsrc/sysutils/webmin/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/Makefile 2008/07/25 02:55:27 1.24
+++ pkgsrc/sysutils/webmin/Makefile 2009/04/09 10:15:01 1.25
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.24 2008/07/25 02:55:27 tonnerre Exp $ 1# $NetBSD: Makefile,v 1.25 2009/04/09 10:15:01 kefren Exp $
2 2
3.include "version.mk" 3.include "version.mk"
4 4
5DISTNAME= webmin-${WBM_VERSION} 5DISTNAME= webmin-${WBM_VERSION}
6PKGREVISION= 3 
7CATEGORIES= sysutils www 6CATEGORIES= sysutils www
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.webmin.com/ 10HOMEPAGE= http://www.webmin.com/
12COMMENT= Perl web server and CGI for Unix system administration 11COMMENT= Perl web server and CGI for Unix system administration
13 12
14DEPENDS+= p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay 13DEPENDS+= p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
15 14
16NOT_FOR_BULK_PLATFORM= HPUX-*-* 15NOT_FOR_BULK_PLATFORM= HPUX-*-*
17 16
18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 17WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
19USE_LANGUAGES= # empty 18USE_LANGUAGES= # empty
cvs diff -r1.10 -r1.11 pkgsrc/sysutils/webmin/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/PLIST 2007/10/08 08:47:08 1.10
+++ pkgsrc/sysutils/webmin/PLIST 2009/04/09 10:15:01 1.11
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1@comment $NetBSD: PLIST,v 1.10 2007/10/08 08:47:08 obache Exp $ 1@comment $NetBSD: PLIST,v 1.11 2009/04/09 10:15:01 kefren Exp $
2share/examples/rc.d/webmin 2share/examples/rc.d/webmin
3share/examples/webmin/acl/config 3share/examples/webmin/acl/config
4share/examples/webmin/config 4share/examples/webmin/config
5share/examples/webmin/cron/config 5share/examples/webmin/cron/config
6share/examples/webmin/init/config 6share/examples/webmin/init/config
7share/examples/webmin/inittab/config 7share/examples/webmin/inittab/config
8share/examples/webmin/install-dir 8share/examples/webmin/install-dir
9share/examples/webmin/man/config 9share/examples/webmin/man/config
10share/examples/webmin/miniserv.conf 10share/examples/webmin/miniserv.conf
11share/examples/webmin/miniserv.users 11share/examples/webmin/miniserv.users
12share/examples/webmin/perl-path 12share/examples/webmin/perl-path
13share/examples/webmin/proc/config 13share/examples/webmin/proc/config
14share/examples/webmin/reload 14share/examples/webmin/reload
15share/examples/webmin/restart 15share/examples/webmin/restart
16share/examples/webmin/servers/config 16share/examples/webmin/servers/config
17share/examples/webmin/start 17share/examples/webmin/start
18share/examples/webmin/stop 18share/examples/webmin/stop
19share/examples/webmin/var-path 19share/examples/webmin/var-path
20share/examples/webmin/version 20share/examples/webmin/version
21share/examples/webmin/webmin.acl 21share/examples/webmin/webmin.acl
22share/examples/webmin/webmin/config 22share/examples/webmin/webmin/config
23share/examples/webmin/webminlog/config 23share/examples/webmin/webminlog/config
24share/webmin/LICENCE 24share/webmin/LICENCE
25share/webmin/LICENCE.ja 25share/webmin/LICENCE.ja
26share/webmin/PATENTS 26share/webmin/PATENTS
27share/webmin/README 27share/webmin/README
 28share/webmin/WebminCore.pm
28share/webmin/Webmin/All.pm 29share/webmin/Webmin/All.pm
29share/webmin/Webmin/Button.pm 30share/webmin/Webmin/Button.pm
30share/webmin/Webmin/Checkbox.pm 31share/webmin/Webmin/Checkbox.pm
31share/webmin/Webmin/Checkboxes.pm 32share/webmin/Webmin/Checkboxes.pm
32share/webmin/Webmin/Columns.pm 33share/webmin/Webmin/Columns.pm
33share/webmin/Webmin/ConfirmPage.pm 34share/webmin/Webmin/ConfirmPage.pm
34share/webmin/Webmin/Date.pm 35share/webmin/Webmin/Date.pm
35share/webmin/Webmin/DynamicBar.pm 36share/webmin/Webmin/DynamicBar.pm
36share/webmin/Webmin/DynamicHTML.pm 37share/webmin/Webmin/DynamicHTML.pm
37share/webmin/Webmin/DynamicText.pm 38share/webmin/Webmin/DynamicText.pm
38share/webmin/Webmin/DynamicWait.pm 39share/webmin/Webmin/DynamicWait.pm
39share/webmin/Webmin/ErrorPage.pm 40share/webmin/Webmin/ErrorPage.pm
40share/webmin/Webmin/File.pm 41share/webmin/Webmin/File.pm
@@ -100,32 +101,35 @@ share/webmin/acl/config @@ -100,32 +101,35 @@ share/webmin/acl/config
100share/webmin/acl/config-*-linux 101share/webmin/acl/config-*-linux
101share/webmin/acl/config-dragonfly 102share/webmin/acl/config-dragonfly
102share/webmin/acl/config-freebsd 103share/webmin/acl/config-freebsd
103share/webmin/acl/config-macos 104share/webmin/acl/config-macos
104share/webmin/acl/config-netbsd 105share/webmin/acl/config-netbsd
105share/webmin/acl/config-openbsd 106share/webmin/acl/config-openbsd
106share/webmin/acl/config-solaris-10-* 107share/webmin/acl/config-solaris-10-*
107share/webmin/acl/config.info 108share/webmin/acl/config.info
108share/webmin/acl/config.info.bg 109share/webmin/acl/config.info.bg
109share/webmin/acl/config.info.ca 110share/webmin/acl/config.info.ca
110share/webmin/acl/config.info.cz 111share/webmin/acl/config.info.cz
111share/webmin/acl/config.info.da 112share/webmin/acl/config.info.da
112share/webmin/acl/config.info.de 113share/webmin/acl/config.info.de
 114share/webmin/acl/config.info.hr
 115share/webmin/acl/config.info.it
113share/webmin/acl/config.info.es 116share/webmin/acl/config.info.es
114share/webmin/acl/config.info.fa 117share/webmin/acl/config.info.fa
115share/webmin/acl/config.info.fr 118share/webmin/acl/config.info.fr
116share/webmin/acl/config.info.hu 119share/webmin/acl/config.info.hu
117share/webmin/acl/config.info.ja_JP.UTF-8 120share/webmin/acl/config.info.ja_JP.UTF-8
118share/webmin/acl/config.info.ja_JP.euc 121share/webmin/acl/config.info.ja_JP.euc
 122share/webmin/acl/config.info.ko_KR.UTF-8
119share/webmin/acl/config.info.ko_KR.euc 123share/webmin/acl/config.info.ko_KR.euc
120share/webmin/acl/config.info.nl 124share/webmin/acl/config.info.nl
121share/webmin/acl/config.info.no 125share/webmin/acl/config.info.no
122share/webmin/acl/config.info.pl 126share/webmin/acl/config.info.pl
123share/webmin/acl/config.info.pt_BR 127share/webmin/acl/config.info.pt_BR
124share/webmin/acl/config.info.ru_RU 128share/webmin/acl/config.info.ru_RU
125share/webmin/acl/config.info.ru_SU 129share/webmin/acl/config.info.ru_SU
126share/webmin/acl/config.info.sk 130share/webmin/acl/config.info.sk
127share/webmin/acl/config.info.sv 131share/webmin/acl/config.info.sv
128share/webmin/acl/config.info.tr 132share/webmin/acl/config.info.tr
129share/webmin/acl/config.info.uk_UA 133share/webmin/acl/config.info.uk_UA
130share/webmin/acl/config.info.zh_CN 134share/webmin/acl/config.info.zh_CN
131share/webmin/acl/config.info.zh_CN.UTF-8 135share/webmin/acl/config.info.zh_CN.UTF-8
@@ -139,77 +143,80 @@ share/webmin/acl/delete_groups.cgi @@ -139,77 +143,80 @@ share/webmin/acl/delete_groups.cgi
139share/webmin/acl/delete_session.cgi 143share/webmin/acl/delete_session.cgi
140share/webmin/acl/delete_user.cgi 144share/webmin/acl/delete_user.cgi
141share/webmin/acl/delete_users.cgi 145share/webmin/acl/delete_users.cgi
142share/webmin/acl/edit_acl.cgi 146share/webmin/acl/edit_acl.cgi
143share/webmin/acl/edit_group.cgi 147share/webmin/acl/edit_group.cgi
144share/webmin/acl/edit_pass.cgi 148share/webmin/acl/edit_pass.cgi
145share/webmin/acl/edit_rbac.cgi 149share/webmin/acl/edit_rbac.cgi
146share/webmin/acl/edit_sync.cgi 150share/webmin/acl/edit_sync.cgi
147share/webmin/acl/edit_unix.cgi 151share/webmin/acl/edit_unix.cgi
148share/webmin/acl/edit_user.cgi 152share/webmin/acl/edit_user.cgi
149share/webmin/acl/feedback_files.pl 153share/webmin/acl/feedback_files.pl
150share/webmin/acl/help/ips.ca.html 154share/webmin/acl/help/ips.ca.html
151share/webmin/acl/help/ips.da.html 155share/webmin/acl/help/ips.da.html
 156share/webmin/acl/help/ips.de.html
 157share/webmin/acl/help/ips.it.html
152share/webmin/acl/help/ips.fa.html 158share/webmin/acl/help/ips.fa.html
153share/webmin/acl/help/ips.fr.html 159share/webmin/acl/help/ips.fr.html
154share/webmin/acl/help/ips.html 160share/webmin/acl/help/ips.html
155share/webmin/acl/help/ips.ko_KR.euc.html 161share/webmin/acl/help/ips.ko_KR.euc.html
 162share/webmin/acl/help/ips.ko_KR.UTF-8.html
156share/webmin/acl/help/ips.sk.html 163share/webmin/acl/help/ips.sk.html
157share/webmin/acl/hide.cgi 
158share/webmin/acl/hide_form.cgi 
159share/webmin/acl/images/cert.gif 164share/webmin/acl/images/cert.gif
160share/webmin/acl/images/convert.gif 165share/webmin/acl/images/convert.gif
161share/webmin/acl/images/empty.gif 166share/webmin/acl/images/empty.gif
162share/webmin/acl/images/icon.gif 167share/webmin/acl/images/icon.gif
163share/webmin/acl/images/pass.gif 168share/webmin/acl/images/pass.gif
164share/webmin/acl/images/rbac.gif 169share/webmin/acl/images/rbac.gif
165share/webmin/acl/images/sessions.gif 170share/webmin/acl/images/sessions.gif
166share/webmin/acl/images/smallicon.gif 171share/webmin/acl/images/smallicon.gif
167share/webmin/acl/images/sync.gif 172share/webmin/acl/images/sync.gif
168share/webmin/acl/images/tick.gif 173share/webmin/acl/images/tick.gif
169share/webmin/acl/images/unix.gif 174share/webmin/acl/images/unix.gif
170share/webmin/acl/index.cgi 175share/webmin/acl/index.cgi
171share/webmin/acl/lang/bg 176share/webmin/acl/lang/bg
172share/webmin/acl/lang/ca 177share/webmin/acl/lang/ca
173share/webmin/acl/lang/cz 178share/webmin/acl/lang/cz
174share/webmin/acl/lang/da 179share/webmin/acl/lang/da
175share/webmin/acl/lang/de 180share/webmin/acl/lang/de
176share/webmin/acl/lang/en 181share/webmin/acl/lang/en
177share/webmin/acl/lang/es 182share/webmin/acl/lang/es
178share/webmin/acl/lang/fa 183share/webmin/acl/lang/fa
179share/webmin/acl/lang/fr 184share/webmin/acl/lang/fr
 185share/webmin/acl/lang/hr
180share/webmin/acl/lang/hu 186share/webmin/acl/lang/hu
181share/webmin/acl/lang/it 187share/webmin/acl/lang/it
182share/webmin/acl/lang/ja_JP.UTF-8 188share/webmin/acl/lang/ja_JP.UTF-8
183share/webmin/acl/lang/ja_JP.euc 189share/webmin/acl/lang/ja_JP.euc
184share/webmin/acl/lang/ko_KR.UTF-8 190share/webmin/acl/lang/ko_KR.UTF-8
185share/webmin/acl/lang/ko_KR.euc 191share/webmin/acl/lang/ko_KR.euc
186share/webmin/acl/lang/nl 192share/webmin/acl/lang/nl
187share/webmin/acl/lang/no 193share/webmin/acl/lang/no
188share/webmin/acl/lang/pl 194share/webmin/acl/lang/pl
189share/webmin/acl/lang/pt 195share/webmin/acl/lang/pt
190share/webmin/acl/lang/pt_BR 196share/webmin/acl/lang/pt_BR
191share/webmin/acl/lang/ru_RU 197share/webmin/acl/lang/ru_RU
192share/webmin/acl/lang/ru_SU 198share/webmin/acl/lang/ru_SU
193share/webmin/acl/lang/sk 199share/webmin/acl/lang/sk
194share/webmin/acl/lang/sv 200share/webmin/acl/lang/sv
195share/webmin/acl/lang/tr 201share/webmin/acl/lang/tr
196share/webmin/acl/lang/uk_UA 202share/webmin/acl/lang/uk_UA
197share/webmin/acl/lang/zh_CN 203share/webmin/acl/lang/zh_CN
198share/webmin/acl/lang/zh_CN.UTF-8 204share/webmin/acl/lang/zh_CN.UTF-8
199share/webmin/acl/lang/zh_TW.Big5 205share/webmin/acl/lang/zh_TW.Big5
200share/webmin/acl/lang/zh_TW.UTF-8 206share/webmin/acl/lang/zh_TW.UTF-8
201share/webmin/acl/list_sessions.cgi 207share/webmin/acl/list_sessions.cgi
202share/webmin/acl/log_parser.pl 208share/webmin/acl/log_parser.pl
 209share/webmin/acl/md5-lib.pl
203share/webmin/acl/module.info 210share/webmin/acl/module.info
204share/webmin/acl/openssl.cnf 211share/webmin/acl/openssl.cnf
205share/webmin/acl/postinstall.pl 212share/webmin/acl/postinstall.pl
206share/webmin/acl/save_acl.cgi 213share/webmin/acl/save_acl.cgi
207share/webmin/acl/save_group.cgi 214share/webmin/acl/save_group.cgi
208share/webmin/acl/save_pass.cgi 215share/webmin/acl/save_pass.cgi
209share/webmin/acl/save_sync.cgi 216share/webmin/acl/save_sync.cgi
210share/webmin/acl/save_unix.cgi 217share/webmin/acl/save_unix.cgi
211share/webmin/acl/save_user.cgi 218share/webmin/acl/save_user.cgi
212share/webmin/acl/switch.cgi 219share/webmin/acl/switch.cgi
213share/webmin/acl/useradmin_update.pl 220share/webmin/acl/useradmin_update.pl
214share/webmin/acl/xenroll.dll 221share/webmin/acl/xenroll.dll
215share/webmin/acl_security.pl 222share/webmin/acl_security.pl
@@ -644,27 +651,26 @@ share/webmin/inittab/lang/ko_KR.euc @@ -644,27 +651,26 @@ share/webmin/inittab/lang/ko_KR.euc
644share/webmin/inittab/lang/ms 651share/webmin/inittab/lang/ms
645share/webmin/inittab/lang/pl 652share/webmin/inittab/lang/pl
646share/webmin/inittab/lang/ru_RU 653share/webmin/inittab/lang/ru_RU
647share/webmin/inittab/lang/ru_SU 654share/webmin/inittab/lang/ru_SU
648share/webmin/inittab/lang/sv 655share/webmin/inittab/lang/sv
649share/webmin/inittab/lang/tr 656share/webmin/inittab/lang/tr
650share/webmin/inittab/lang/uk_UA 657share/webmin/inittab/lang/uk_UA
651share/webmin/inittab/lang/zh_CN 658share/webmin/inittab/lang/zh_CN
652share/webmin/inittab/lang/zh_CN.UTF-8 659share/webmin/inittab/lang/zh_CN.UTF-8
653share/webmin/inittab/lang/zh_TW.Big5 660share/webmin/inittab/lang/zh_TW.Big5
654share/webmin/inittab/lang/zh_TW.UTF-8 661share/webmin/inittab/lang/zh_TW.UTF-8
655share/webmin/inittab/log_parser.pl 662share/webmin/inittab/log_parser.pl
656share/webmin/inittab/module.info 663share/webmin/inittab/module.info
657share/webmin/inittab/new_inittab.cgi 
658share/webmin/inittab/save_inittab.cgi 664share/webmin/inittab/save_inittab.cgi
659share/webmin/install-module.pl 665share/webmin/install-module.pl
660share/webmin/install-type 666share/webmin/install-type
661share/webmin/javascript-lib.pl 667share/webmin/javascript-lib.pl
662share/webmin/lang/af 668share/webmin/lang/af
663share/webmin/lang/ar 669share/webmin/lang/ar
664share/webmin/lang/bg 670share/webmin/lang/bg
665share/webmin/lang/ca 671share/webmin/lang/ca
666share/webmin/lang/cz 672share/webmin/lang/cz
667share/webmin/lang/da 673share/webmin/lang/da
668share/webmin/lang/de 674share/webmin/lang/de
669share/webmin/lang/en 675share/webmin/lang/en
670share/webmin/lang/es 676share/webmin/lang/es
@@ -1100,27 +1106,26 @@ share/webmin/proc/medium.skill @@ -1100,27 +1106,26 @@ share/webmin/proc/medium.skill
1100share/webmin/proc/module.info 1106share/webmin/proc/module.info
1101share/webmin/proc/open_files.cgi 1107share/webmin/proc/open_files.cgi
1102share/webmin/proc/openbsd-lib.pl 1108share/webmin/proc/openbsd-lib.pl
1103share/webmin/proc/osf-lib.pl 1109share/webmin/proc/osf-lib.pl
1104share/webmin/proc/proc-lib.pl 1110share/webmin/proc/proc-lib.pl
1105share/webmin/proc/rbac-mapping 1111share/webmin/proc/rbac-mapping
1106share/webmin/proc/renice_proc.cgi 1112share/webmin/proc/renice_proc.cgi
1107share/webmin/proc/run.cgi 1113share/webmin/proc/run.cgi
1108share/webmin/proc/syslog_logs.pl 1114share/webmin/proc/syslog_logs.pl
1109share/webmin/proc/sysv-lib.pl 1115share/webmin/proc/sysv-lib.pl
1110share/webmin/proc/tail.cgi 1116share/webmin/proc/tail.cgi
1111share/webmin/proc/trace.cgi 1117share/webmin/proc/trace.cgi
1112share/webmin/proc/windows-lib.pl 1118share/webmin/proc/windows-lib.pl
1113share/webmin/referer_save.cgi 
1114share/webmin/rpc.cgi 1119share/webmin/rpc.cgi
1115share/webmin/run-postinstalls.pl 1120share/webmin/run-postinstalls.pl
1116share/webmin/run-uninstalls.pl 1121share/webmin/run-uninstalls.pl
1117share/webmin/servers/CHANGELOG 1122share/webmin/servers/CHANGELOG
1118share/webmin/servers/acl_security.pl 1123share/webmin/servers/acl_security.pl
1119share/webmin/servers/auto.pl 1124share/webmin/servers/auto.pl
1120share/webmin/servers/config 1125share/webmin/servers/config
1121share/webmin/servers/config.info 1126share/webmin/servers/config.info
1122share/webmin/servers/config.info.ca 1127share/webmin/servers/config.info.ca
1123share/webmin/servers/config.info.cz 1128share/webmin/servers/config.info.cz
1124share/webmin/servers/config.info.de 1129share/webmin/servers/config.info.de
1125share/webmin/servers/config.info.es 1130share/webmin/servers/config.info.es
1126share/webmin/servers/config.info.fr 1131share/webmin/servers/config.info.fr
@@ -1420,26 +1425,123 @@ share/webmin/webminlog/lang/sv @@ -1420,26 +1425,123 @@ share/webmin/webminlog/lang/sv
1420share/webmin/webminlog/lang/tr 1425share/webmin/webminlog/lang/tr
1421share/webmin/webminlog/lang/uk_UA 1426share/webmin/webminlog/lang/uk_UA
1422share/webmin/webminlog/lang/zh_CN 1427share/webmin/webminlog/lang/zh_CN
1423share/webmin/webminlog/lang/zh_CN.UTF-8 1428share/webmin/webminlog/lang/zh_CN.UTF-8
1424share/webmin/webminlog/lang/zh_TW.Big5 1429share/webmin/webminlog/lang/zh_TW.Big5
1425share/webmin/webminlog/lang/zh_TW.UTF-8 1430share/webmin/webminlog/lang/zh_TW.UTF-8
1426share/webmin/webminlog/log_parser.pl 1431share/webmin/webminlog/log_parser.pl
1427share/webmin/webminlog/module.info 1432share/webmin/webminlog/module.info
1428share/webmin/webminlog/rollback.cgi 1433share/webmin/webminlog/rollback.cgi
1429share/webmin/webminlog/search.cgi 1434share/webmin/webminlog/search.cgi
1430share/webmin/webminlog/view.cgi 1435share/webmin/webminlog/view.cgi
1431share/webmin/webminlog/webminlog-lib.pl 1436share/webmin/webminlog/webminlog-lib.pl
1432share/webmin/xmlrpc.cgi 1437share/webmin/xmlrpc.cgi
 1438share/webmin/cron/config-macos-9.2-*
 1439share/webmin/cron/config.info.hr
 1440share/webmin/cron/config.info.it
 1441share/webmin/cron/lang/hr
 1442share/webmin/images/bar-blue.gif
 1443share/webmin/images/bar-grey.gif
 1444share/webmin/images/bar-purple.gif
 1445share/webmin/images/bar-red.gif
 1446share/webmin/images/bar-white.gif
 1447share/webmin/images/down.gif
 1448share/webmin/images/gap.gif
 1449share/webmin/images/movedown.gif
 1450share/webmin/images/movegap.gif
 1451share/webmin/images/moveup.gif
 1452share/webmin/images/up.gif
 1453share/webmin/images/webmin-blue.png
 1454share/webmin/images/webmin-blue.svg
 1455share/webmin/init/config.info.cz
 1456share/webmin/init/config.info.ko_KR.UTF-8
 1457share/webmin/init/config.info.ko_KR.euc
 1458share/webmin/init/config.info.nl
 1459share/webmin/init/help/help.ko_KR.UTF-8.html
 1460share/webmin/init/help/help.ko_KR.euc.html
 1461share/webmin/init/help/proc.ko_KR.UTF-8.html
 1462share/webmin/init/help/proc.ko_KR.euc.html
 1463share/webmin/init/lang/cz
 1464share/webmin/init/lang/nl
 1465share/webmin/inittab/config.info.cz
 1466share/webmin/inittab/config.info.ko_KR.UTF-8
 1467share/webmin/inittab/config.info.nl
 1468share/webmin/inittab/lang/cz
 1469share/webmin/inittab/lang/nl
 1470share/webmin/lang/el
 1471share/webmin/man/config.info.cz
 1472share/webmin/man/config.info.nl
 1473share/webmin/man/lang/nl
 1474share/webmin/proc/config.info.cz
 1475share/webmin/proc/config.info.ja_JP.UTF-8
 1476share/webmin/proc/config.info.ja_JP.euc
 1477share/webmin/proc/config.info.nl
 1478share/webmin/proc/help/cmd.it.html
 1479share/webmin/proc/help/cpu.it.html
 1480share/webmin/proc/help/edit_proc.it.html
 1481share/webmin/proc/help/input.it.html
 1482share/webmin/proc/help/intro.it.html
 1483share/webmin/proc/help/mode.it.html
 1484share/webmin/proc/help/nice.it.html
 1485share/webmin/proc/help/open_proc.it.html
 1486share/webmin/proc/help/overview.it.html
 1487share/webmin/proc/help/run.it.html
 1488share/webmin/proc/help/sclass.ca.html
 1489share/webmin/proc/help/sclass.html
 1490share/webmin/proc/help/scpu.it.html
 1491share/webmin/proc/help/search.it.html
 1492share/webmin/proc/help/sfiles.it.html
 1493share/webmin/proc/help/sfs.it.html
 1494share/webmin/proc/help/signore.it.html
 1495share/webmin/proc/help/sip.it.html
 1496share/webmin/proc/help/size.it.html
 1497share/webmin/proc/help/smatch.it.html
 1498share/webmin/proc/help/sprio.ca.html
 1499share/webmin/proc/help/sprio.html
 1500share/webmin/proc/help/ssocket.it.html
 1501share/webmin/proc/help/suser.it.html
 1502share/webmin/proc/help/trace.it.html
 1503share/webmin/proc/help/tree.it.html
 1504share/webmin/proc/help/user.it.html
 1505share/webmin/proc/help/zone.it.html
 1506share/webmin/proc/lang/cz
 1507share/webmin/proc/lang/nl
 1508share/webmin/servers/backup_config.pl
 1509share/webmin/servers/config.info.it
 1510share/webmin/servers/config.info.ja_JP.UTF-8
 1511share/webmin/servers/config.info.ko_KR.UTF-8
 1512share/webmin/servers/config.info.nl
 1513share/webmin/servers/lang/it
 1514share/webmin/servers/lang/nl
 1515share/webmin/webmin/change_debug.cgi
 1516share/webmin/webmin/change_overlay.cgi
 1517share/webmin/webmin/config.info.cz
 1518share/webmin/webmin/config.info.hr
 1519share/webmin/webmin/config.info.it
 1520share/webmin/webmin/config.info.ko_KR.UTF-8
 1521share/webmin/webmin/edit_debug.cgi
 1522share/webmin/webmin/images/debug.gif
 1523share/webmin/webmin/lang/en_GB
 1524share/webmin/webmin/lang/hr
 1525share/webmin/webmin/postinstall.pl
 1526share/webmin/webmin/refresh_modules.cgi
 1527share/webmin/webmin_search.cgi
 1528share/webmin/webminlog/config.info.cz
 1529share/webmin/webminlog/config.info.hr
 1530share/webmin/webminlog/config.info.ko_KR.UTF-8
 1531share/webmin/webminlog/config.info.nl
 1532share/webmin/webminlog/images/star.gif
 1533share/webmin/webminlog/lang/cz
 1534share/webmin/webminlog/lang/hr
1433@dirrm share/webmin/webminlog/lang 1535@dirrm share/webmin/webminlog/lang
1434@dirrm share/webmin/webminlog/images 1536@dirrm share/webmin/webminlog/images
1435@dirrm share/webmin/webminlog 1537@dirrm share/webmin/webminlog
1436@dirrm share/webmin/webmin/subdir 1538@dirrm share/webmin/webmin/subdir
1437@dirrm share/webmin/webmin/lang 1539@dirrm share/webmin/webmin/lang
1438@dirrm share/webmin/webmin/images 1540@dirrm share/webmin/webmin/images
1439@dirrm share/webmin/webmin 1541@dirrm share/webmin/webmin
1440@dirrm share/webmin/servers/lang 1542@dirrm share/webmin/servers/lang
1441@dirrm share/webmin/servers/images 1543@dirrm share/webmin/servers/images
1442@dirrm share/webmin/servers 1544@dirrm share/webmin/servers
1443@dirrm share/webmin/proc/lang 1545@dirrm share/webmin/proc/lang
1444@dirrm share/webmin/proc/images 1546@dirrm share/webmin/proc/images
1445@dirrm share/webmin/proc/help 1547@dirrm share/webmin/proc/help
cvs diff -r1.16 -r1.17 pkgsrc/sysutils/webmin/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/distinfo 2008/07/25 02:55:27 1.16
+++ pkgsrc/sysutils/webmin/distinfo 2009/04/09 10:15:01 1.17
@@ -1,31 +1,29 @@ @@ -1,31 +1,29 @@
1$NetBSD: distinfo,v 1.16 2008/07/25 02:55:27 tonnerre Exp $ 1$NetBSD: distinfo,v 1.17 2009/04/09 10:15:01 kefren Exp $
2 2
3SHA1 (webmin-1.370.tar.gz) = ed4c1ee751953146356f308c4091eb8ad21df309 3SHA1 (webmin-1.470.tar.gz) = ace7931c33495fb9a1c76500060feb7019d6acbf
4RMD160 (webmin-1.370.tar.gz) = 28805b553adc85b642ad3acffa3765a5127a529d 4RMD160 (webmin-1.470.tar.gz) = 58acf6703c6469850837796b2e0cbcdb258cf07f
5Size (webmin-1.370.tar.gz) = 13132344 bytes 5Size (webmin-1.470.tar.gz) = 14105863 bytes
6SHA1 (patch-aa) = 3b66c111357358548a8f5e47ae4dfb2e9be5fc2a 6SHA1 (patch-aa) = e1dadeb9bb59a9fd040a0befa1ac06ac20fe4fbf
7SHA1 (patch-ab) = fa07200462df76af23b9952739388053940c6743 7SHA1 (patch-ab) = fa07200462df76af23b9952739388053940c6743
8SHA1 (patch-ac) = c4f73a091ef8b5c5c0d5a6f82427c497e823a946 8SHA1 (patch-ac) = b69286454a8b07f6eb0aceee95ab1b3e396ceb45
9SHA1 (patch-ad) = 51d6875b0d825b06ab088e7e63f3e86c280a06f6 9SHA1 (patch-ad) = cc629f057a8f7895a2ee9a5ffac071b6a52284e4
10SHA1 (patch-ae) = 16583d392d44176e8175e7637851d000ca2ecb9d 10SHA1 (patch-ae) = fcbee4c734f80d62bd9ea58af34e730529b86620
11SHA1 (patch-af) = 24f130a985ab7d3bdfc7db8d82114e8b107f1574 11SHA1 (patch-af) = 24f130a985ab7d3bdfc7db8d82114e8b107f1574
12SHA1 (patch-ag) = 4a2ba61d26a3f3a9bb0e1a22a8afb65d66e43746 12SHA1 (patch-ag) = a42266da672f6953b837a64185f8f2dfda3f11d1
13SHA1 (patch-ah) = 9cf6fc0d420535697eac2c32a29701fc095ef67f 13SHA1 (patch-ah) = 820af8ea032e1aa36684b157e9377a056086df25
14SHA1 (patch-ai) = 14accea4c38882933da3b565fe51adec06db1878 14SHA1 (patch-ai) = fc4272323726fe15d7c7a96d70228976459721e6
15SHA1 (patch-aj) = bc86ea60c49266fc537690b07d194d5c2fa690c4 
16SHA1 (patch-ak) = 201c124d8c407e0439b8531dfb4dacba37ce37bb 15SHA1 (patch-ak) = 201c124d8c407e0439b8531dfb4dacba37ce37bb
17SHA1 (patch-al) = b1382143d42af3ce5057368dc442ba9c2e6de259 16SHA1 (patch-al) = b1382143d42af3ce5057368dc442ba9c2e6de259
18SHA1 (patch-am) = d61fed9c53870aad36651389a5d655f5b2d5c21f 17SHA1 (patch-am) = d61fed9c53870aad36651389a5d655f5b2d5c21f
19SHA1 (patch-an) = 4416c2586fc7a732b255d4787be1a3f93c23f32c 18SHA1 (patch-an) = 4416c2586fc7a732b255d4787be1a3f93c23f32c
20SHA1 (patch-ao) = 007eba7b551fd3d154e470f82c1c15552481e9fa 19SHA1 (patch-ao) = 007eba7b551fd3d154e470f82c1c15552481e9fa
21SHA1 (patch-ap) = 7b8c983770c7fd08b20de36b006e0f30ce1bce3e 20SHA1 (patch-ap) = 7b8c983770c7fd08b20de36b006e0f30ce1bce3e
22SHA1 (patch-aq) = 52751d7ec0ce1ebb89aee977a752486372b80e36 21SHA1 (patch-aq) = 52751d7ec0ce1ebb89aee977a752486372b80e36
23SHA1 (patch-ar) = 647703ab0281991cec015f2f6a6d191c70c0301e 22SHA1 (patch-ar) = 647703ab0281991cec015f2f6a6d191c70c0301e
24SHA1 (patch-as) = 65f246bfca5b077d15bf0e874d56792f08c93c03 23SHA1 (patch-as) = 65f246bfca5b077d15bf0e874d56792f08c93c03
25SHA1 (patch-at) = 72e88355d9c3bd159d5077acc81073ec048efd0b 
26SHA1 (patch-au) = f0d0aaf6819f92fd96543246e7600054fb150d08 24SHA1 (patch-au) = f0d0aaf6819f92fd96543246e7600054fb150d08
27SHA1 (patch-av) = c3a4096058a432863eb10a2b2d44184bc91f8926 25SHA1 (patch-av) = c3a4096058a432863eb10a2b2d44184bc91f8926
28SHA1 (patch-aw) = 2d7738459ed4618b11558d31aef70a42f26c25be 26SHA1 (patch-aw) = 2d7738459ed4618b11558d31aef70a42f26c25be
29SHA1 (patch-ax) = 09f78731d35603e736b22a0f1e478103ca14cc4d 27SHA1 (patch-ax) = 09f78731d35603e736b22a0f1e478103ca14cc4d
30SHA1 (patch-ay) = 04bf4d094a2051469e956b4e57af842daf0232d7 28SHA1 (patch-ay) = dd861b0e5710e3ccc6aabf49a1ac3baaa141dbf0
31SHA1 (patch-az) = 55e40bcf0841b20d185265fff98685fe56cb1810 29SHA1 (patch-az) = 9860d1504397acbff90e4964aa8f9e505d853456
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/webmin/version.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/version.mk 2007/10/05 15:47:00 1.4
+++ pkgsrc/sysutils/webmin/version.mk 2009/04/09 10:15:01 1.5
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1# $NetBSD: version.mk,v 1.4 2007/10/05 15:47:00 obache Exp $ 1# $NetBSD: version.mk,v 1.5 2009/04/09 10:15:01 kefren Exp $
2 2
3WBM_VERSION= 1.370 3WBM_VERSION= 1.470
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/webmin/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/patches/patch-aa 2007/10/05 15:47:00 1.6
+++ pkgsrc/sysutils/webmin/patches/patch-aa 2009/04/09 10:15:01 1.7
@@ -1,110 +1,134 @@ @@ -1,110 +1,134 @@
1$NetBSD: patch-aa,v 1.6 2007/10/05 15:47:00 obache Exp $ 1--- setup.sh.orig 2009-03-18 07:30:26.000000000 +0200
2 2+++ setup.sh 2009-04-09 12:24:40.000000000 +0300
3--- setup.sh.orig 2007-09-21 21:26:02.000000000 +0000 3@@ -35,6 +35,11 @@
4+++ setup.sh 
5@@ -35,6 +35,11 @@ echo "" 
6  4
7 # Only root can run this 5 # Only root can run this
8 id | grep "uid=0(" >/dev/null 6 id | grep "uid=0(" >/dev/null
9+# 7+#
10+# For pkgsrc, we allow anyone to run this script, including unprivileged 8+# For pkgsrc, we allow anyone to run this script, including unprivileged
11+# users. 9+# users.
12+# 10+#
13+true 11+true
14 if [ $? != "0" ]; then 12 if [ $? != "0" ]; then
15 uname -a | grep -i CYGWIN >/dev/null 13 uname -a | grep -i CYGWIN >/dev/null
16 if [ $? != "0" ]; then 14 if [ $? != "0" ]; then
17@@ -122,6 +127,9 @@ if [ -r "$config_dir/config" ]; then 15@@ -122,6 +127,9 @@
18 upgrading=1 16 upgrading=1
19 fi 17 fi
20  18
21+# For pkgsrc, we are never upgrading, only installing. 19+# For pkgsrc, we are never upgrading, only installing.
22+upgrading=0 20+upgrading=0
23+ 21+
24 # Check if upgrading from an old version 22 # Check if upgrading from an old version
25 if [ "$upgrading" = 1 ]; then 23 if [ "$upgrading" = 1 ]; then
26 echo "" 24 echo ""
27@@ -199,6 +207,10 @@ if [ "$upgrading" = 1 ]; then 25@@ -199,6 +207,10 @@
28 else 26 else
29 # Config directory exists .. make sure it is not in use 27 # Config directory exists .. make sure it is not in use
30 ls $config_dir | grep -v rpmsave >/dev/null 2>&1 28 ls $config_dir | grep -v rpmsave >/dev/null 2>&1
31+ # 29+ #
32+ # For pkgsrc, we don't care if the config directory already exists. 30+ # For pkgsrc, we don't care if the config directory already exists.
33+ # 31+ #
34+ false 32+ false
35 if [ "$?" = "0" -a "$config_dir" != "/etc/webmin" ]; then 33 if [ "$?" = "0" -a "$config_dir" != "/etc/webmin" ]; then
36 echo "ERROR: Config directory $config_dir is not empty" 34 echo "ERROR: Config directory $config_dir is not empty"
37 echo "" 35 echo ""
38@@ -527,6 +539,12 @@ else 36@@ -528,6 +540,12 @@
39  37
40 kfile=$config_dir/miniserv.pem 38 kfile=$config_dir/miniserv.pem
41 openssl version >/dev/null 2>&1 39 openssl version >/dev/null 2>&1
42+ # 40+ #
43+ # For pkgsrc, we always want to use the default miniserv.pem, though 41+ # For pkgsrc, we always want to use the default miniserv.pem, though
44+ # we'll recommend to the user at post-install time to generate a 42+ # we'll recommend to the user at post-install time to generate a
45+ # new certificate. 43+ # new certificate.
46+ # 44+ #
47+ false 45+ false
48 if [ "$?" = "0" ]; then 46 if [ "$?" = "0" ]; then
49 # We can generate a new SSL key for this host 47 # We can generate a new SSL key for this host
50 host=`hostname` 48 host=`hostname`
51@@ -733,31 +751,34 @@ EOF 49@@ -742,44 +760,47 @@
52 echo "" 50 echo ""
53 fi 51 fi
54  52
55-echo "Changing ownership and permissions .." 53-echo "Changing ownership and permissions .."
 54-# Make all config dirs non-world-readable
56-for m in $newmods; do 55-for m in $newmods; do
57- chown -R root $config_dir/$m 56- chown -R root $config_dir/$m
58- chgrp -R bin $config_dir/$m 57- chgrp -R bin $config_dir/$m
59- chmod -R og-rw $config_dir/$m 58- chmod -R og-rw $config_dir/$m
60-done 59-done
 60-# Make miniserv config files non-world-readable
61-for f in miniserv.conf miniserv.pem miniserv.users; do 61-for f in miniserv.conf miniserv.pem miniserv.users; do
62- chown -R root $config_dir/$f 62- chown -R root $config_dir/$f
63- chgrp -R bin $config_dir/$f 63- chgrp -R bin $config_dir/$f
64- chmod -R og-rw $config_dir/$f 64- chmod -R og-rw $config_dir/$f
65-done 65-done
66-chmod +r $config_dir/version 66-chmod +r $config_dir/version
67-if [ "$nochown" = "" ]; then 67-if [ "$nochown" = "" ]; then
 68- # Make program directory non-world-writable, but executable
68- chown -R root "$wadir" 69- chown -R root "$wadir"
69- chgrp -R bin "$wadir" 70- chgrp -R bin "$wadir"
70- chmod -R og-w "$wadir" 71- chmod -R og-w "$wadir"
71- chmod -R a+rx "$wadir" 72- chmod -R a+rx "$wadir"
72-fi 73-fi
73-if [ $var_dir != "/var" ]; then 74-if [ $var_dir != "/var" ]; then
 75- # Make log directory non-world-readable or writable
74- chown -R root $var_dir 76- chown -R root $var_dir
75- chgrp -R bin $var_dir 77- chgrp -R bin $var_dir
76- chmod -R og-rwx $var_dir 78- chmod -R og-rwx $var_dir
77-fi 79-fi
 80-# Fix up bad permissions from some older installs
 81-for m in ldap-client ldap-server ldap-useradmin mailboxes mysql postgresql servers virtual-server; do
 82- if [ -d "$config_dir/$m" ]; then
 83- chown root $config_dir/$m
 84- chgrp bin $config_dir/$m
 85- chmod og-rw $config_dir/$m
 86- chmod og-rw $config_dir/$m/config 2>/dev/null
 87- fi
 88-done
78-echo "..done" 89-echo "..done"
79-echo "" 90-echo ""
80+# For pkgsrc, we skip changing ownership and permissions as we allow the 91+# For pkgsrc, we skip changing ownership and permissions as we allow the
81+# INSTALL/DEINSTALL to manage this for us. 92+# INSTALL/DEINSTALL to manage this for us.
82+# 93+#
83+#echo "Changing ownership and permissions .." 94+#echo "Changing ownership and permissions .."
 95+## Make all config dirs non-world-readable
84+#for m in $newmods; do 96+#for m in $newmods; do
85+# chown -R root $config_dir/$m 97+# chown -R root $config_dir/$m
86+# chgrp -R bin $config_dir/$m 98+# chgrp -R bin $config_dir/$m
87+# chmod -R og-rw $config_dir/$m 99+# chmod -R og-rw $config_dir/$m
88+#done 100+#done
 101+## Make miniserv config files non-world-readable
89+#for f in miniserv.conf miniserv.pem miniserv.users; do 102+#for f in miniserv.conf miniserv.pem miniserv.users; do
90+# chown -R root $config_dir/$f 103+# chown -R root $config_dir/$f
91+# chgrp -R bin $config_dir/$f 104+# chgrp -R bin $config_dir/$f
92+# chmod -R og-rw $config_dir/$f 105+# chmod -R og-rw $config_dir/$f
93+#done 106+#done
94+#chmod +r $config_dir/version 107+#chmod +r $config_dir/version
95+#if [ "$nochown" = "" ]; then 108+#if [ "$nochown" = "" ]; then
 109+# # Make program directory non-world-writable, but executable
96+# chown -R root "$wadir" 110+# chown -R root "$wadir"
97+# chgrp -R bin "$wadir" 111+# chgrp -R bin "$wadir"
98+# chmod -R og-w "$wadir" 112+# chmod -R og-w "$wadir"
99+# chmod -R a+rx "$wadir" 113+# chmod -R a+rx "$wadir"
100+#fi 114+#fi
101+#if [ $var_dir != "/var" ]; then 115+#if [ $var_dir != "/var" ]; then
 116+# # Make log directory non-world-readable or writable
102+# chown -R root $var_dir 117+# chown -R root $var_dir
103+# chgrp -R bin $var_dir 118+# chgrp -R bin $var_dir
104+# chmod -R og-rwx $var_dir 119+# chmod -R og-rwx $var_dir
105+#fi 120+#fi
 121+## Fix up bad permissions from some older installs
 122+#for m in ldap-client ldap-server ldap-useradmin mailboxes mysql postgresql servers virtual-server; do
 123+# if [ -d "$config_dir/$m" ]; then
 124+# chown root $config_dir/$m
 125+# chgrp bin $config_dir/$m
 126+# chmod og-rw $config_dir/$m
 127+# chmod og-rw $config_dir/$m/config 2>/dev/null
 128+# fi
 129+#done
106+#echo "..done" 130+#echo "..done"
107+#echo "" 131+#echo ""
108  132
109 # Save target directory if one was specified 133 # Save target directory if one was specified
110 if [ "$wadir" != "$srcdir" ]; then 134 if [ "$wadir" != "$srcdir" ]; then
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/webmin/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/patches/patch-ac 2008/07/25 02:55:27 1.3
+++ pkgsrc/sysutils/webmin/patches/patch-ac 2009/04/09 10:15:01 1.4
@@ -1,34 +1,30 @@ @@ -1,34 +1,30 @@
1$NetBSD: patch-ac,v 1.3 2008/07/25 02:55:27 tonnerre Exp $ 1--- software/search.cgi.orig 2009-03-18 07:30:27.000000000 +0200
2 2+++ software/search.cgi 2009-04-09 12:27:58.000000000 +0300
3--- software/search.cgi.orig 2007-09-21 23:26:13.000000000 +0200 3@@ -34,7 +34,7 @@
4+++ software/search.cgi 
5@@ -34,7 +34,8 @@ if (@match == 1 && $in{'goto'}) { 
6 if (@match) { 4 if (@match) {
7 @match = sort { lc($packages{$a,'name'}) cmp lc($packages{$b,'name'}) } 5 @match = sort { lc($packages{$a,'name'}) cmp lc($packages{$b,'name'}) }
8 @match; 6 @match;
9- print "<b>",&text('search_match', "<tt>$s</tt>"),"</b><p>\n"; 7- print "<b>",&text('search_match', "<tt>$s</tt>"),"</b><p>\n";
10+ print "<b>",&text('search_match', "<tt>" . &html_escape($s) . "</tt>"), 8+ print "<b>",&text('search_match', "<tt>" . &html_escape($s) . "</tt>"),"</b><p>\n";
11+ "</b><p>\n"; 9 print &ui_form_start("delete_packs.cgi", "post");
12 print "<form action=delete_packs.cgi method=post>\n"; 10 print &ui_hidden("search", $in{'search'});
13 print "<input type=hidden name=search value='$in{'search'}'>\n"; 
14 @tds = ( "width=5" ); 11 @tds = ( "width=5" );
15@@ -47,7 +48,8 @@ if (@match) { 12@@ -47,7 +47,8 @@
16 $text{'search_desc'} ], 100, 0, \@tds); 13 $text{'search_desc'} ], 100, 0, \@tds);
17 foreach $i (@match) { 14 foreach $i (@match) {
18 local @cols; 15 local @cols;
19- push(@cols, "<a href=\"edit_pack.cgi?search=$s&package=". 16- push(@cols, "<a href=\"edit_pack.cgi?search=$s&package=".
20+ push(@cols, "<a href=\"edit_pack.cgi?search=" . 17+ push(@cols, "<a href=\"edit_pack.cgi?search=" .
21+ &urlize($s) . "&package=". 18+ &urlize($s) . "&package=".
22 &urlize($packages{$i,'name'})."&version=". 19 &urlize($packages{$i,'name'})."&version=".
23 &urlize($packages{$i,'version'})."\">".&html_escape( 20 &urlize($packages{$i,'version'})."\">".&html_escape(
24 $packages{$i,'name'}.($packages{$i,'version'} ? 21 $packages{$i,'name'}.($packages{$i,'version'} ?
25@@ -69,7 +71,8 @@ if (@match) { 22@@ -69,7 +70,7 @@
26 print "<input type=submit value='$text{'search_delete'}'></form>\n"; 23 print &ui_form_end([ [ undef, $text{'search_delete'} ] ]);
27 } 24 }
28 else { 25 else {
29- print "<b>",&text('search_nomatch', "<tt>$s</tt>"),"</b><p>\n"; 26- print "<b>",&text('search_nomatch', "<tt>$s</tt>"),"</b><p>\n";
30+ print "<b>",&text('search_nomatch', "<tt>" . &html_escape($s) . 27+ print "<b>",&text('search_nomatch', "<tt>" . &html_escape($s) . "</tt>"),"</b><p>\n";
31+ "</tt>"),"</b><p>\n"; 
32 } 28 }
33  29
34 &ui_print_footer("", $text{'index_return'}); 30 &ui_print_footer("", $text{'index_return'});
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/webmin/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/patches/Attic/patch-ae 2007/09/01 06:35:00 1.3
+++ pkgsrc/sysutils/webmin/patches/Attic/patch-ae 2009/04/09 10:15:01 1.4
@@ -1,13 +1,11 @@ @@ -1,13 +1,11 @@
1$NetBSD: patch-ae,v 1.3 2007/09/01 06:35:00 obache Exp $ 1--- man/module.info.orig 2009-03-18 07:30:39.000000000 +0200
2 2+++ man/module.info 2009-04-09 12:33:13.000000000 +0300
3--- man/module.info.orig 2007-08-02 20:49:05.000000000 +0000 3@@ -9,7 +9,7 @@
4+++ man/module.info 4 name=Man
5@@ -15,7 +15,7 @@ desc_pt=Páginas do Manual 
6 category=system 
7 desc_zh_TW.UTF-8=手冊頠
8 desc_tr=Kýlavuz Sayfalar 5 desc_tr=Kýlavuz Sayfalar
 6 desc_de=Systemdokumentation
9-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 7-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
10+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 8+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
11 desc=System Documentation 9 desc_sk=Systémová dokumentácia
12 desc_es=Páginas del Manual 10 desc_zh_CN=ʹÓÃÊÖ²á
13 desc_sv=Systemdokumentation 11 risk=low medium high
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/webmin/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/patches/Attic/patch-ah 2007/09/01 06:35:00 1.3
+++ pkgsrc/sysutils/webmin/patches/Attic/patch-ah 2009/04/09 10:15:01 1.4
@@ -1,13 +1,11 @@ @@ -1,13 +1,11 @@
1$NetBSD: patch-ah,v 1.3 2007/09/01 06:35:00 obache Exp $ 1--- cron/module.info.orig 2009-03-18 07:30:40.000000000 +0200
2 2+++ cron/module.info 2009-04-09 12:35:58.000000000 +0300
3--- cron/module.info.orig 2007-08-02 20:49:05.000000000 +0000 3@@ -10,7 +10,7 @@
4+++ cron/module.info 4 name=Cron Manager
5@@ -15,7 +15,7 @@ desc_zh_CN=Cron ÈÎÎñµ÷¶È 
6 category=system 
7 desc_zh_TW.UTF-8=定時執行工作 (Cron) 
8 desc_tr=Zamanlandýrýlmýþ Görevler 5 desc_tr=Zamanlandýrýlmýþ Görevler
 6 desc_de=Geplante Auftr&#228;ge (Cron)
9-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 7-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
10+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 8+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
11 desc=Scheduled Cron Jobs 9 desc_sk=Cron Plánovaè úloh
12 desc_es=Tareas Planificadas (Cron) 10 desc_zh_CN=Cron ÈÎÎñµ÷È
13 desc_sv=Schemalagda cronjobb 11 risk=low medium high
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/webmin/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/patches/Attic/patch-ai 2007/09/01 06:35:00 1.3
+++ pkgsrc/sysutils/webmin/patches/Attic/patch-ai 2009/04/09 10:15:01 1.4
@@ -1,13 +1,11 @@ @@ -1,13 +1,11 @@
1$NetBSD: patch-ai,v 1.3 2007/09/01 06:35:00 obache Exp $ 1--- init/module.info.orig 2009-03-18 07:30:40.000000000 +0200
2 2+++ init/module.info 2009-04-09 12:37:02.000000000 +0300
3--- init/module.info.orig 2007-08-02 20:49:05.000000000 +0000 3@@ -22,7 +22,7 @@
4+++ init/module.info 4 desc_ru_SU=úÁÇÒÕÚËÁ É ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ ÓÉÓÔÅÍÙ
5@@ -14,7 +14,7 @@ desc_pt=Iniciar e Encerrar 
6 category=system 
7 desc_zh_TW.UTF-8=開機與關機 
8 desc_tr=Açýlýþ ve Kapanýþ 5 desc_tr=Açýlýþ ve Kapanýþ
 6 desc_de=System-Start und -Stop
9-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 7-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
10+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 8+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
11 desc=Bootup and Shutdown 9 desc_sk=©tart a vypnutie
12 desc_es=Arranque y Parada 10 desc_ko_KR.euc=ºÎÆà ¹× Á¾·á
13 desc_sv=Start och avstängning 11 desc_zh_CN=Òýµ¼ºÍ¹Ø»ú
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/webmin/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/patches/patch-ad 2007/10/05 15:47:00 1.5
+++ pkgsrc/sysutils/webmin/patches/patch-ad 2009/04/09 10:15:01 1.6
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1$NetBSD: patch-ad,v 1.5 2007/10/05 15:47:00 obache Exp $ 1--- os_list.txt.orig 2009-03-18 07:30:26.000000000 +0200
2 2+++ os_list.txt 2009-04-09 12:31:24.000000000 +0300
3--- os_list.txt.orig 2007-09-21 21:26:02.000000000 +0000 3@@ -255,19 +255,13 @@
4+++ os_list.txt 
5@@ -236,18 +236,14 @@ openmamba Linux $1 openmamba-linux $1  
6 # All FreeBSD versions 
7 FreeBSD $1 freebsd $1 $uname =~ /FreeBSD.*?\s([0-9]+\.[0-9\.]+)/i 4 FreeBSD $1 freebsd $1 $uname =~ /FreeBSD.*?\s([0-9]+\.[0-9\.]+)/i
8  5
9-# FreeBSD clones 6 # FreeBSD clones
10-DragonFly BSD 1.0 freebsd 4.8 $uname =~ /DragonFly.*?\s1\.0A/i 7-DragonFly BSD 1.0 freebsd 4.8 $uname =~ /DragonFly.*?\s1\.0A/i
11-DragonFly BSD 1.2 freebsd 4.10 $uname =~ /DragonFly.*?\s1\.2A/i 8-DragonFly BSD 1.2 freebsd 4.10 $uname =~ /DragonFly.*?\s1\.2A/i
12+# DragonFly 
13+DragonFly $1 dragonfly $1 $uname =~ /DragonFly.*?\s([0-9\.]+)/i 9+DragonFly $1 dragonfly $1 $uname =~ /DragonFly.*?\s([0-9\.]+)/i
14  10
15 # All OpenBSD versions 11 # All OpenBSD versions
16 OpenBSD $1 openbsd $1 $uname =~ /OpenBSD.*?\s([0-9\.]+)/i 12 OpenBSD $1 openbsd $1 $uname =~ /OpenBSD.*?\s([0-9\.]+)/i
17  13
18 # All NetBSD versions 14 # All NetBSD versions
19-NetBSD 1.5 netbsd 1.5 $uname =~ /NetBSD.*1\.5/i 15-NetBSD 1.5 netbsd 1.5 $uname =~ /NetBSD.*1\.5/i
20-NetBSD 1.6 netbsd 1.6 $uname =~ /NetBSD.*1\.6/i 16-NetBSD 1.6 netbsd 1.6 $uname =~ /NetBSD.*1\.6/i
21-NetBSD 2.0 netbsd 2.0 $uname =~ /NetBSD.*2\.0/i 17-NetBSD 2.0 netbsd 2.0 $uname =~ /NetBSD.*2\.0/i
22-NetBSD 3.0 netbsd 3.0 $uname =~ /NetBSD.*3\.0/i 18-NetBSD 3.0 netbsd 3.0 $uname =~ /NetBSD.*3\.0/i
 19-NetBSD 4.0 netbsd 4.0 $uname =~ /NetBSD.*4\.0/i
 20-NetBSD $1 netbsd $1 `uname` =~ /NetBSD/ && `uname -r` =~ /([\d.]+)/
23+NetBSD $1 netbsd $1 $uname =~ /NetBSD.*?\s([0-9\.]+)/i 21+NetBSD $1 netbsd $1 $uname =~ /NetBSD.*?\s([0-9\.]+)/i
24  22
25 # BSDI (may not be detected properly) 23 # BSDI (may not be detected properly)
26 BSDI $1 freebsd $1 $uname =~ /BSDI.*\s([0-9\.]+)/i 24 BSDI $1 freebsd $1 $uname =~ /BSDI.*\s([0-9\.]+)/i
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/webmin/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/patches/patch-ag 2007/04/21 05:22:58 1.2
+++ pkgsrc/sysutils/webmin/patches/patch-ag 2009/04/09 10:15:01 1.3
@@ -1,13 +1,11 @@ @@ -1,13 +1,11 @@
1$NetBSD: patch-ag,v 1.2 2007/04/21 05:22:58 obache Exp $ 1--- proc/module.info.orig 2009-03-18 07:30:39.000000000 +0200
2 2+++ proc/module.info 2009-04-09 12:34:49.000000000 +0300
3--- proc/module.info.orig 2007-04-09 05:00:48.000000000 +0000 3@@ -11,7 +11,7 @@
4+++ proc/module.info 4 name=Process Manager
5@@ -13,7 +13,7 @@ desc_pt=Processos em Curso 
6 category=system 
7 desc_zh_TW.UTF-8=執行中的程庠
8 desc_tr=Çalýþan Süreçler 5 desc_tr=Çalýþan Süreçler
 6 desc_de=Laufende Prozesse
9-os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows 7-os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows
10+os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows dragonfly 8+os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows dragonfly
11 desc=Running Processes 9 desc_zh_CN=½ø³Ì¹ÜÀíÆ÷
12 desc_es=Procesos en curso 10 risk=medium high
13 desc_sv=Processhanterare 11 desc_ja_JP.UTF-8=実行プロセス
File Deleted: pkgsrc/sysutils/webmin/patches/Attic/patch-aj
File Deleted: pkgsrc/sysutils/webmin/patches/Attic/patch-at
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/webmin/patches/patch-ay (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/patches/patch-ay 2008/07/25 02:55:28 1.1
+++ pkgsrc/sysutils/webmin/patches/patch-ay 2009/04/09 10:15:01 1.2
@@ -1,50 +1,46 @@ @@ -1,50 +1,46 @@
1$NetBSD: patch-ay,v 1.1 2008/07/25 02:55:28 tonnerre Exp $ 1--- mailboxes/mail_search.cgi.orig 2009-03-18 07:30:35.000000000 +0200
2 2+++ mailboxes/mail_search.cgi 2009-04-09 12:43:30.000000000 +0300
3--- mailboxes/mail_search.cgi.orig 2007-09-21 23:28:31.000000000 +0200 3@@ -46,7 +46,8 @@
4+++ mailboxes/mail_search.cgi 
5@@ -46,7 +46,8 @@ if ($in{'simple'}) { 
6 @searchlist = ( [ $field, $what ] ); 4 @searchlist = ( [ $field, $what ] );
7 @rv = &mailbox_search_mail(\@searchlist, 0, $folder); 5 @rv = &mailbox_search_mail(\@searchlist, 0, $folder);
8 print "<p><b>",&text('search_results5', scalar(@rv), 6 print "<p><b>",&text('search_results5', scalar(@rv),
9- "<tt>$field</tt>", "<tt>$what</tt>")," ..</b><p>\n"; 7- "<tt>$field</tt>", "<tt>$what</tt>")," ..</b><p>\n";
10+ "<tt>" . &html_escape($field) . "</tt>", "<tt>" . 8+ "<tt>" . &html_escape($field) . "</tt>", "<tt>" .
11+ &html_escape($what) . "</tt>")," ..</b><p>\n"; 9+ &html_escape($what) . "</tt>")," ..</b><p>\n";
12 } 10 }
13 else { 11 else {
14 # Just search by Subject and From in one folder 12 # Just search by Subject and From in one folder
15@@ -73,7 +74,8 @@ if ($in{'simple'}) { 13@@ -73,7 +74,8 @@
16 &error($text{'search_eboolean'}); 14 &error($text{'search_eboolean'});
17 } 15 }
18 print "<p><b>",&text('search_results2', scalar(@rv), 16 print "<p><b>",&text('search_results2', scalar(@rv),
19- "<tt>$in{'search'}</tt>")," ..</b><p>\n"; 17- "<tt>$in{'search'}</tt>")," ..</b><p>\n";
20+ "<tt>" . &html_escape($in{'search'}) . 18+ "<tt>" . &html_escape($in{'search'}) .
21+ "</tt>")," ..</b><p>\n"; 19+ "</tt>")," ..</b><p>\n";
22 } 20 }
23 foreach $mail (@rv) { 21 foreach $mail (@rv) {
24 $mail->{'folder'} = $folder; 22 $mail->{'folder'} = $folder;
25@@ -106,8 +108,10 @@ else { 23@@ -106,8 +108,8 @@
26 $showto = $folder->{'sent'} || $folder->{'drafts'}; 24 # Show list of messages, with form
27 if (@rv) { 25 if (@rv) {
28 print "<form action=delete_mail.cgi method=post>\n"; 26 print &ui_form_start("delete_mail.cgi", "post");
29- print "<input type=hidden name=folder value='$in{'folder'}'>\n"; 27- print &ui_hidden("user", $in{'user'});
30- print "<input type=hidden name=user value='$in{'user'}'>\n"; 28- print &ui_hidden("folder", $in{'folder'});
31+ print "<input type=hidden name=folder value='" . 29+ print &ui_hidden("user", &html_escape($in{'user'}));
32+ &html_escape($in{'folder'}) . "'>\n"; 30+ print &ui_hidden("folder", &html_escape($in{'folder'}));
33+ print "<input type=hidden name=user value='" . 31 if ($config{'top_buttons'} && !$multi_folder) {
34+ &html_escape($in{'user'}) . "'>\n"; 32 &show_buttons(1, \@folders, $folder, \@rv, $in{'user'}, 1);
35 if ($config{'top_buttons'}) { 33 }
36 if (!$multi_folder) { 34@@ -121,8 +123,9 @@
37 &show_buttons(1, \@folders, $folder, \@rv, $in{'user'}, 
38@@ -200,8 +204,9 @@ else { 
39 print "<b>$text{'search_none'}</b> <p>\n"; 35 print "<b>$text{'search_none'}</b> <p>\n";
40 } 36 }
41  37
42-&ui_print_footer($in{'simple'} ? ( ) : ( "search_form.cgi?folder=$in{'folder'}", 38-&ui_print_footer($in{'simple'} ? ( ) : ( "search_form.cgi?folder=$in{'folder'}",
43- $text{'sform_return'} ), 39- $text{'sform_return'} ),
44- "list_mail.cgi?user=$in{'user'}&folder=$in{'folder'}", $text{'mail_return'}, 40- "list_mail.cgi?user=$in{'user'}&folder=$in{'folder'}", $text{'mail_return'},
45+&ui_print_footer($in{'simple'} ? ( ) : ( "search_form.cgi?folder=" . 41+&ui_print_footer($in{'simple'} ? ( ) : ( "search_form.cgi?folder=" .
46+ &urlize($in{'folder'}), $text{'sform_return'} ), 42+ &urlize($in{'folder'}), $text{'sform_return'} ),
47+ "list_mail.cgi?user=" . &urlize($in{'user'}) . "&folder=" . 43+ "list_mail.cgi?user=" . &urlize($in{'user'}) . "&folder=" .
48+ &urlize($in{'folder'}), $text{'mail_return'}, 44+ &urlize($in{'folder'}), $text{'mail_return'},
49 "", $text{'index_return'}); 45 "", $text{'index_return'});
50  46
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/webmin/patches/patch-az (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/patches/patch-az 2008/07/25 02:55:28 1.1
+++ pkgsrc/sysutils/webmin/patches/patch-az 2009/04/09 10:15:01 1.2
@@ -1,28 +1,22 @@ @@ -1,28 +1,22 @@
1$NetBSD: patch-az,v 1.1 2008/07/25 02:55:28 tonnerre Exp $ 1--- mailboxes/search_form.cgi.orig 2009-03-18 07:30:35.000000000 +0200
2 2+++ mailboxes/search_form.cgi 2009-04-09 12:47:29.000000000 +0300
3--- mailboxes/search_form.cgi.orig 2007-09-21 23:28:31.000000000 +0200 3@@ -13,8 +13,8 @@
4+++ mailboxes/search_form.cgi 
5@@ -12,8 +12,10 @@ require './mailboxes-lib.pl'; 
6 &folder_link($in{'user'}, $folder)); 
7  4
8 print "<form action=mail_search.cgi>\n"; 5 # Start of form
9-print "<input type=hidden name=user value='$in{'user'}'>\n"; 6 print &ui_form_start("mail_search.cgi");
10-print "<input type=hidden name=ofolder value='$in{'folder'}'>\n"; 7-print &ui_hidden("user", $in{'user'});
11+print "<input type=hidden name=user value='" . &html_escape($in{'user'}) . 8-print &ui_hidden("ofolder", $in{'folder'});
12+ "'>\n"; 9+print &ui_hidden("user", &html_escape($in{'user'}));
13+print "<input type=hidden name=ofolder value='" . &html_escape($in{'folder'}) . 10+print &ui_hidden("ofolder", &html_escape($in{'folder'}));
14+ "'>\n"; 11 print &ui_table_start($text{'sform_header'}, "width=100%", 2);
15 print "<input type=radio name=and value=1 checked> $text{'sform_and'}\n"; 
16 print "<input type=radio name=and value=0> $text{'sform_or'}<p>\n"; 
17  12
18@@ -48,7 +50,7 @@ print " $text{'sform_folder'} ",&folder_ 13 # And/or mode
19 $extra); 14@@ -54,7 +54,7 @@
20 print "</form>\n"; 15 print &ui_table_end();
 16 print &ui_form_end([ [ undef, $text{'sform_ok'} ] ]);
21  17
22-&ui_print_footer("list_mail.cgi?folder=$in{'folder'}&user=". 18-&ui_print_footer("list_mail.cgi?folder=$in{'folder'}&user=".
23- &urlize($in{'user'}), $text{'mail_return'}, 
24- "", $text{'index_return'}); 
25+&ui_print_footer("list_mail.cgi?folder=" . &urlize($in{'folder'}) . "&user=". 19+&ui_print_footer("list_mail.cgi?folder=" . &urlize($in{'folder'}) . "&user=".
26+ &urlize($in{'user'}), $text{'mail_return'}, "", 20 &urlize($in{'user'}), $text{'mail_return'},
27+ $text{'index_return'}); 21 "", $text{'index_return'});
28  22