summaryrefslogtreecommitdiff
path: root/sysutils/webmin/patches
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/webmin/patches')
-rw-r--r--sysutils/webmin/patches/patch-aa42
-rw-r--r--sysutils/webmin/patches/patch-ac24
-rw-r--r--sysutils/webmin/patches/patch-ad14
-rw-r--r--sysutils/webmin/patches/patch-ae18
-rw-r--r--sysutils/webmin/patches/patch-ag18
-rw-r--r--sysutils/webmin/patches/patch-ah18
-rw-r--r--sysutils/webmin/patches/patch-ai18
-rw-r--r--sysutils/webmin/patches/patch-aj46
-rw-r--r--sysutils/webmin/patches/patch-at38
-rw-r--r--sysutils/webmin/patches/patch-ay34
-rw-r--r--sysutils/webmin/patches/patch-az38
11 files changed, 112 insertions, 196 deletions
diff --git a/sysutils/webmin/patches/patch-aa b/sysutils/webmin/patches/patch-aa
index fbecaf04d7d..f5ae9e56e37 100644
--- a/sysutils/webmin/patches/patch-aa
+++ b/sysutils/webmin/patches/patch-aa
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2007/10/05 15:47:00 obache Exp $
-
---- setup.sh.orig 2007-09-21 21:26:02.000000000 +0000
-+++ setup.sh
-@@ -35,6 +35,11 @@ echo ""
+--- 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 @@
# Only root can run this
id | grep "uid=0(" >/dev/null
@@ -14,7 +12,7 @@ $NetBSD: patch-aa,v 1.6 2007/10/05 15:47:00 obache Exp $
if [ $? != "0" ]; then
uname -a | grep -i CYGWIN >/dev/null
if [ $? != "0" ]; then
-@@ -122,6 +127,9 @@ if [ -r "$config_dir/config" ]; then
+@@ -122,6 +127,9 @@
upgrading=1
fi
@@ -24,7 +22,7 @@ $NetBSD: patch-aa,v 1.6 2007/10/05 15:47:00 obache Exp $
# Check if upgrading from an old version
if [ "$upgrading" = 1 ]; then
echo ""
-@@ -199,6 +207,10 @@ if [ "$upgrading" = 1 ]; then
+@@ -199,6 +207,10 @@
else
# Config directory exists .. make sure it is not in use
ls $config_dir | grep -v rpmsave >/dev/null 2>&1
@@ -35,7 +33,7 @@ $NetBSD: patch-aa,v 1.6 2007/10/05 15:47:00 obache Exp $
if [ "$?" = "0" -a "$config_dir" != "/etc/webmin" ]; then
echo "ERROR: Config directory $config_dir is not empty"
echo ""
-@@ -527,6 +539,12 @@ else
+@@ -528,6 +540,12 @@
kfile=$config_dir/miniserv.pem
openssl version >/dev/null 2>&1
@@ -48,16 +46,18 @@ $NetBSD: patch-aa,v 1.6 2007/10/05 15:47:00 obache Exp $
if [ "$?" = "0" ]; then
# We can generate a new SSL key for this host
host=`hostname`
-@@ -733,31 +751,34 @@ EOF
+@@ -742,44 +760,47 @@
echo ""
fi
-echo "Changing ownership and permissions .."
+-# Make all config dirs non-world-readable
-for m in $newmods; do
- chown -R root $config_dir/$m
- chgrp -R bin $config_dir/$m
- chmod -R og-rw $config_dir/$m
-done
+-# Make miniserv config files non-world-readable
-for f in miniserv.conf miniserv.pem miniserv.users; do
- chown -R root $config_dir/$f
- chgrp -R bin $config_dir/$f
@@ -65,27 +65,40 @@ $NetBSD: patch-aa,v 1.6 2007/10/05 15:47:00 obache Exp $
-done
-chmod +r $config_dir/version
-if [ "$nochown" = "" ]; then
+- # Make program directory non-world-writable, but executable
- chown -R root "$wadir"
- chgrp -R bin "$wadir"
- chmod -R og-w "$wadir"
- chmod -R a+rx "$wadir"
-fi
-if [ $var_dir != "/var" ]; then
+- # Make log directory non-world-readable or writable
- chown -R root $var_dir
- chgrp -R bin $var_dir
- chmod -R og-rwx $var_dir
-fi
+-# Fix up bad permissions from some older installs
+-for m in ldap-client ldap-server ldap-useradmin mailboxes mysql postgresql servers virtual-server; do
+- if [ -d "$config_dir/$m" ]; then
+- chown root $config_dir/$m
+- chgrp bin $config_dir/$m
+- chmod og-rw $config_dir/$m
+- chmod og-rw $config_dir/$m/config 2>/dev/null
+- fi
+-done
-echo "..done"
-echo ""
+# For pkgsrc, we skip changing ownership and permissions as we allow the
+# INSTALL/DEINSTALL to manage this for us.
+#
+#echo "Changing ownership and permissions .."
++## Make all config dirs non-world-readable
+#for m in $newmods; do
+# chown -R root $config_dir/$m
+# chgrp -R bin $config_dir/$m
+# chmod -R og-rw $config_dir/$m
+#done
++## Make miniserv config files non-world-readable
+#for f in miniserv.conf miniserv.pem miniserv.users; do
+# chown -R root $config_dir/$f
+# chgrp -R bin $config_dir/$f
@@ -93,16 +106,27 @@ $NetBSD: patch-aa,v 1.6 2007/10/05 15:47:00 obache Exp $
+#done
+#chmod +r $config_dir/version
+#if [ "$nochown" = "" ]; then
++# # Make program directory non-world-writable, but executable
+# chown -R root "$wadir"
+# chgrp -R bin "$wadir"
+# chmod -R og-w "$wadir"
+# chmod -R a+rx "$wadir"
+#fi
+#if [ $var_dir != "/var" ]; then
++# # Make log directory non-world-readable or writable
+# chown -R root $var_dir
+# chgrp -R bin $var_dir
+# chmod -R og-rwx $var_dir
+#fi
++## Fix up bad permissions from some older installs
++#for m in ldap-client ldap-server ldap-useradmin mailboxes mysql postgresql servers virtual-server; do
++# if [ -d "$config_dir/$m" ]; then
++# chown root $config_dir/$m
++# chgrp bin $config_dir/$m
++# chmod og-rw $config_dir/$m
++# chmod og-rw $config_dir/$m/config 2>/dev/null
++# fi
++#done
+#echo "..done"
+#echo ""
diff --git a/sysutils/webmin/patches/patch-ac b/sysutils/webmin/patches/patch-ac
index f34eb48ed94..96741162377 100644
--- a/sysutils/webmin/patches/patch-ac
+++ b/sysutils/webmin/patches/patch-ac
@@ -1,18 +1,15 @@
-$NetBSD: patch-ac,v 1.3 2008/07/25 02:55:27 tonnerre Exp $
-
---- software/search.cgi.orig 2007-09-21 23:26:13.000000000 +0200
-+++ software/search.cgi
-@@ -34,7 +34,8 @@ if (@match == 1 && $in{'goto'}) {
+--- 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 @@
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 "<form action=delete_packs.cgi method=post>\n";
- print "<input type=hidden name=search value='$in{'search'}'>\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 +48,8 @@ if (@match) {
+@@ -47,7 +47,8 @@
$text{'search_desc'} ], 100, 0, \@tds);
foreach $i (@match) {
local @cols;
@@ -22,13 +19,12 @@ $NetBSD: patch-ac,v 1.3 2008/07/25 02:55:27 tonnerre Exp $
&urlize($packages{$i,'name'})."&version=".
&urlize($packages{$i,'version'})."\">".&html_escape(
$packages{$i,'name'}.($packages{$i,'version'} ?
-@@ -69,7 +71,8 @@ if (@match) {
- print "<input type=submit value='$text{'search_delete'}'></form>\n";
+@@ -69,7 +70,7 @@
+ 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'});
diff --git a/sysutils/webmin/patches/patch-ad b/sysutils/webmin/patches/patch-ad
index e21d42ac32c..3f1e0e8c88f 100644
--- a/sysutils/webmin/patches/patch-ad
+++ b/sysutils/webmin/patches/patch-ad
@@ -1,15 +1,11 @@
-$NetBSD: patch-ad,v 1.5 2007/10/05 15:47:00 obache Exp $
-
---- os_list.txt.orig 2007-09-21 21:26:02.000000000 +0000
-+++ os_list.txt
-@@ -236,18 +236,14 @@ openmamba Linux $1 openmamba-linux $1
- # All FreeBSD versions
+--- 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 @@
FreeBSD $1 freebsd $1 $uname =~ /FreeBSD.*?\s([0-9]+\.[0-9\.]+)/i
--# FreeBSD clones
+ # FreeBSD clones
-DragonFly BSD 1.0 freebsd 4.8 $uname =~ /DragonFly.*?\s1\.0A/i
-DragonFly BSD 1.2 freebsd 4.10 $uname =~ /DragonFly.*?\s1\.2A/i
-+# DragonFly
+DragonFly $1 dragonfly $1 $uname =~ /DragonFly.*?\s([0-9\.]+)/i
# All OpenBSD versions
@@ -20,6 +16,8 @@ $NetBSD: patch-ad,v 1.5 2007/10/05 15:47:00 obache Exp $
-NetBSD 1.6 netbsd 1.6 $uname =~ /NetBSD.*1\.6/i
-NetBSD 2.0 netbsd 2.0 $uname =~ /NetBSD.*2\.0/i
-NetBSD 3.0 netbsd 3.0 $uname =~ /NetBSD.*3\.0/i
+-NetBSD 4.0 netbsd 4.0 $uname =~ /NetBSD.*4\.0/i
+-NetBSD $1 netbsd $1 `uname` =~ /NetBSD/ && `uname -r` =~ /([\d.]+)/
+NetBSD $1 netbsd $1 $uname =~ /NetBSD.*?\s([0-9\.]+)/i
# BSDI (may not be detected properly)
diff --git a/sysutils/webmin/patches/patch-ae b/sysutils/webmin/patches/patch-ae
index 2dcda8b8bf9..e9b74a8c486 100644
--- a/sysutils/webmin/patches/patch-ae
+++ b/sysutils/webmin/patches/patch-ae
@@ -1,13 +1,11 @@
-$NetBSD: patch-ae,v 1.3 2007/09/01 06:35:00 obache Exp $
-
---- man/module.info.orig 2007-08-02 20:49:05.000000000 +0000
-+++ man/module.info
-@@ -15,7 +15,7 @@ desc_pt=Páginas do Manual
- category=system
- desc_zh_TW.UTF-8=手冊é 
+--- man/module.info.orig 2009-03-18 07:30:39.000000000 +0200
++++ man/module.info 2009-04-09 12:33:13.000000000 +0300
+@@ -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
- desc=System Documentation
- desc_es=Páginas del Manual
- desc_sv=Systemdokumentation
+ desc_sk=Systémová dokumentácia
+ desc_zh_CN=ʹÓÃÊÖ²á
+ risk=low medium high
diff --git a/sysutils/webmin/patches/patch-ag b/sysutils/webmin/patches/patch-ag
index a27d8339652..e703752da43 100644
--- a/sysutils/webmin/patches/patch-ag
+++ b/sysutils/webmin/patches/patch-ag
@@ -1,13 +1,11 @@
-$NetBSD: patch-ag,v 1.2 2007/04/21 05:22:58 obache Exp $
-
---- proc/module.info.orig 2007-04-09 05:00:48.000000000 +0000
-+++ proc/module.info
-@@ -13,7 +13,7 @@ desc_pt=Processos em Curso
- category=system
- desc_zh_TW.UTF-8=執行中的程åº
+--- 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 @@
+ name=Process Manager
desc_tr=Çalýþan Süreçler
+ desc_de=Laufende Prozesse
-os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows
+os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows dragonfly
- desc=Running Processes
- desc_es=Procesos en curso
- desc_sv=Processhanterare
+ desc_zh_CN=½ø³Ì¹ÜÀíÆ÷
+ risk=medium high
+ desc_ja_JP.UTF-8=実行プロセス
diff --git a/sysutils/webmin/patches/patch-ah b/sysutils/webmin/patches/patch-ah
index bd6dfc5c7cc..5b6b5c99f43 100644
--- a/sysutils/webmin/patches/patch-ah
+++ b/sysutils/webmin/patches/patch-ah
@@ -1,13 +1,11 @@
-$NetBSD: patch-ah,v 1.3 2007/09/01 06:35:00 obache Exp $
-
---- cron/module.info.orig 2007-08-02 20:49:05.000000000 +0000
-+++ cron/module.info
-@@ -15,7 +15,7 @@ desc_zh_CN=Cron ÈÎÎñµ÷¶È
- category=system
- desc_zh_TW.UTF-8=定時執行工作 (Cron)
+--- cron/module.info.orig 2009-03-18 07:30:40.000000000 +0200
++++ cron/module.info 2009-04-09 12:35:58.000000000 +0300
+@@ -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
- desc=Scheduled Cron Jobs
- desc_es=Tareas Planificadas (Cron)
- desc_sv=Schemalagda cronjobb
+ desc_sk=Cron Plánovaè úloh
+ desc_zh_CN=Cron ÈÎÎñµ÷¶È
+ risk=low medium high
diff --git a/sysutils/webmin/patches/patch-ai b/sysutils/webmin/patches/patch-ai
index 1afb7891e92..2c1d0a4d45b 100644
--- a/sysutils/webmin/patches/patch-ai
+++ b/sysutils/webmin/patches/patch-ai
@@ -1,13 +1,11 @@
-$NetBSD: patch-ai,v 1.3 2007/09/01 06:35:00 obache Exp $
-
---- init/module.info.orig 2007-08-02 20:49:05.000000000 +0000
-+++ init/module.info
-@@ -14,7 +14,7 @@ desc_pt=Iniciar e Encerrar
- category=system
- desc_zh_TW.UTF-8=開機與關機
+--- 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=úÁÇÒÕÚËÁ É ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ ÓÉÓÔÅÍÙ
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
- desc=Bootup and Shutdown
- desc_es=Arranque y Parada
- desc_sv=Start och avstängning
+ desc_sk=©tart a vypnutie
+ desc_ko_KR.euc=ºÎÆà ¹× Á¾·á
+ desc_zh_CN=Òýµ¼ºÍ¹Ø»ú
diff --git a/sysutils/webmin/patches/patch-aj b/sysutils/webmin/patches/patch-aj
deleted file mode 100644
index 37c7e4723ab..00000000000
--- a/sysutils/webmin/patches/patch-aj
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
-
---- proc/index_search.cgi.orig 2008-07-25 04:39:36.000000000 +0200
-+++ proc/index_search.cgi
-@@ -22,12 +22,12 @@ printf "<input type=radio name=mode valu
- $in{mode}==1 ? "checked" : "";
- print &hlink("<b>$text{'search_match'}</b>","smatch"),"\n";
- printf "<input name=match size=20 value=\"%s\"><br>\n",
-- $in{mode}==1 ? $in{match} : "";
-+ $in{mode}==1 ? &html_escape($in{match}) : "";
-
- printf "<input type=radio name=mode value=2 %s>\n",
- $in{mode}==2 ? "checked" : "";
- $cpu = sprintf "<input name=cpu size=4 value=\"%s\">\n",
-- $in{mode}==2 ? $in{cpu} : "";
-+ $in{mode}==2 ? html_escape($in{cpu}) : "";
- print &hlink("<b>".&text('search_cpupc', $cpu)."</b>", "scpu"),"<br>\n";
-
- print "</td><td valign=top>\n";
-@@ -49,7 +49,7 @@ if ($has_fuser_command) {
- }
- else {
- printf "<input name=fs size=15 value='%s'><br>\n",
-- $in{'mode'}==3 ? $in{'fs'} : "";
-+ $in{'mode'}==3 ? &html_escape($in{'fs'}) : "";
- }
-
- printf "<input type=radio name=mode value=4 %s>\n",
-@@ -66,7 +66,7 @@ if ($has_lsof_command) {
- $in{mode}==5 ? "checked" : "";
- print &hlink("<b>$text{'search_port'}</b>","ssocket"),"\n";
- printf "<input name=port size=6 value='%s'>\n",
-- $in{mode}==5 ? $in{port} : "";
-+ $in{mode}==5 ? &html_escape($in{port}) : "";
-
- # Show input for protocol and port
- print &hlink("<b>$text{'search_protocol'}</b>","ssocket"),"\n";
-@@ -83,7 +83,7 @@ if ($has_lsof_command) {
- $in{mode}==6 ? "checked" : "";
- print &hlink("<b>$text{'search_ip'}</b>","sip"),"\n";
- printf "<input name=ip size=15 value='%s'>\n",
-- $in{mode}==6 ? $in{ip} : "";
-+ $in{mode}==6 ? &html_escape($in{ip}) : "";
- }
-
- print "</td></tr></table>\n";
diff --git a/sysutils/webmin/patches/patch-at b/sysutils/webmin/patches/patch-at
deleted file mode 100644
index ca40f8189cd..00000000000
--- a/sysutils/webmin/patches/patch-at
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-at,v 1.1 2008/07/25 02:55:27 tonnerre Exp $
-
---- cluster-software/software/search.cgi.orig 2007-09-21 23:27:39.000000000 +0200
-+++ cluster-software/software/search.cgi
-@@ -34,9 +34,11 @@ 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 "<form action=delete_packs.cgi method=post>\n";
-- print "<input type=hidden name=search value='$in{'search'}'>\n";
-+ print "<input type=hidden name=search value='" .
-+ &html_escape($in{'search'}) . "'>\n";
- print &select_all_link("del", 0, $text{'search_selall'}),"&nbsp;\n";
- print &select_invert_link("del", 0, $text{'search_invert'}),"<br>\n";
- print &ui_columns_start([ "",
-@@ -45,7 +47,8 @@ if (@match) {
- $text{'search_desc'} ], 100);
- foreach $i (@match) {
- local @cols;
-- push(@cols, "<a href=\"edit_pack.cgi?search=$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'} ?
-@@ -63,7 +66,8 @@ if (@match) {
- print "<input type=submit value='$text{'search_delete'}'></form>\n";
- }
- 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";
- }
-
- &ui_print_footer("", $text{'index_return'});
diff --git a/sysutils/webmin/patches/patch-ay b/sysutils/webmin/patches/patch-ay
index c97178ab744..1a3911e67e0 100644
--- a/sysutils/webmin/patches/patch-ay
+++ b/sysutils/webmin/patches/patch-ay
@@ -1,8 +1,6 @@
-$NetBSD: patch-ay,v 1.1 2008/07/25 02:55:28 tonnerre Exp $
-
---- mailboxes/mail_search.cgi.orig 2007-09-21 23:28:31.000000000 +0200
-+++ mailboxes/mail_search.cgi
-@@ -46,7 +46,8 @@ if ($in{'simple'}) {
+--- 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 @@
@searchlist = ( [ $field, $what ] );
@rv = &mailbox_search_mail(\@searchlist, 0, $folder);
print "<p><b>",&text('search_results5', scalar(@rv),
@@ -12,7 +10,7 @@ $NetBSD: patch-ay,v 1.1 2008/07/25 02:55:28 tonnerre Exp $
}
else {
# Just search by Subject and From in one folder
-@@ -73,7 +74,8 @@ if ($in{'simple'}) {
+@@ -73,7 +74,8 @@
&error($text{'search_eboolean'});
}
print "<p><b>",&text('search_results2', scalar(@rv),
@@ -22,20 +20,18 @@ $NetBSD: patch-ay,v 1.1 2008/07/25 02:55:28 tonnerre Exp $
}
foreach $mail (@rv) {
$mail->{'folder'} = $folder;
-@@ -106,8 +108,10 @@ else {
- $showto = $folder->{'sent'} || $folder->{'drafts'};
+@@ -106,8 +108,8 @@
+ # Show list of messages, with form
if (@rv) {
- print "<form action=delete_mail.cgi method=post>\n";
-- print "<input type=hidden name=folder value='$in{'folder'}'>\n";
-- print "<input type=hidden name=user value='$in{'user'}'>\n";
-+ print "<input type=hidden name=folder value='" .
-+ &html_escape($in{'folder'}) . "'>\n";
-+ print "<input type=hidden name=user value='" .
-+ &html_escape($in{'user'}) . "'>\n";
- if ($config{'top_buttons'}) {
- if (!$multi_folder) {
- &show_buttons(1, \@folders, $folder, \@rv, $in{'user'},
-@@ -200,8 +204,9 @@ else {
+ print &ui_form_start("delete_mail.cgi", "post");
+- print &ui_hidden("user", $in{'user'});
+- print &ui_hidden("folder", $in{'folder'});
++ print &ui_hidden("user", &html_escape($in{'user'}));
++ print &ui_hidden("folder", &html_escape($in{'folder'}));
+ if ($config{'top_buttons'} && !$multi_folder) {
+ &show_buttons(1, \@folders, $folder, \@rv, $in{'user'}, 1);
+ }
+@@ -121,8 +123,9 @@
print "<b>$text{'search_none'}</b> <p>\n";
}
diff --git a/sysutils/webmin/patches/patch-az b/sysutils/webmin/patches/patch-az
index e5a6d39e11d..6ac30caaf8c 100644
--- a/sysutils/webmin/patches/patch-az
+++ b/sysutils/webmin/patches/patch-az
@@ -1,28 +1,22 @@
-$NetBSD: patch-az,v 1.1 2008/07/25 02:55:28 tonnerre Exp $
-
---- mailboxes/search_form.cgi.orig 2007-09-21 23:28:31.000000000 +0200
-+++ mailboxes/search_form.cgi
-@@ -12,8 +12,10 @@ require './mailboxes-lib.pl';
- &folder_link($in{'user'}, $folder));
+--- 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 @@
- print "<form action=mail_search.cgi>\n";
--print "<input type=hidden name=user value='$in{'user'}'>\n";
--print "<input type=hidden name=ofolder value='$in{'folder'}'>\n";
-+print "<input type=hidden name=user value='" . &html_escape($in{'user'}) .
-+ "'>\n";
-+print "<input type=hidden name=ofolder value='" . &html_escape($in{'folder'}) .
-+ "'>\n";
- print "<input type=radio name=and value=1 checked> $text{'sform_and'}\n";
- print "<input type=radio name=and value=0> $text{'sform_or'}<p>\n";
+ # Start of form
+ print &ui_form_start("mail_search.cgi");
+-print &ui_hidden("user", $in{'user'});
+-print &ui_hidden("ofolder", $in{'folder'});
++print &ui_hidden("user", &html_escape($in{'user'}));
++print &ui_hidden("ofolder", &html_escape($in{'folder'}));
+ print &ui_table_start($text{'sform_header'}, "width=100%", 2);
-@@ -48,7 +50,7 @@ print " $text{'sform_folder'} ",&folder_
- $extra);
- print "</form>\n";
+ # And/or mode
+@@ -54,7 +54,7 @@
+ print &ui_table_end();
+ print &ui_form_end([ [ undef, $text{'sform_ok'} ] ]);
-&ui_print_footer("list_mail.cgi?folder=$in{'folder'}&user=".
-- &urlize($in{'user'}), $text{'mail_return'},
-- "", $text{'index_return'});
+&ui_print_footer("list_mail.cgi?folder=" . &urlize($in{'folder'}) . "&user=".
-+ &urlize($in{'user'}), $text{'mail_return'}, "",
-+ $text{'index_return'});
+ &urlize($in{'user'}), $text{'mail_return'},
+ "", $text{'index_return'});