diff options
Diffstat (limited to 'sysutils/webmin/patches')
| -rw-r--r-- | sysutils/webmin/patches/patch-aa | 25 | ||||
| -rw-r--r-- | sysutils/webmin/patches/patch-ac | 35 | ||||
| -rw-r--r-- | sysutils/webmin/patches/patch-ag | 12 |
3 files changed, 29 insertions, 43 deletions
diff --git a/sysutils/webmin/patches/patch-aa b/sysutils/webmin/patches/patch-aa index 72b3b6accb4..3adeb7d2f98 100644 --- a/sysutils/webmin/patches/patch-aa +++ b/sysutils/webmin/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ +$NetBSD: patch-aa,v 1.8.34.1 2017/02/12 15:28:37 spz Exp $ ---- 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 @@ +--- setup.sh.orig 2016-10-03 12:34:36.000000000 +0900 ++++ setup.sh 2016-11-12 07:08:43.000000000 +0900 +@@ -37,6 +37,11 @@ echo "" # Only root can run this - id | grep "uid=0(" >/dev/null + id | grep -i "uid=0(" >/dev/null +# +# For pkgsrc, we allow anyone to run this script, including unprivileged +# users. @@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ if [ $? != "0" ]; then uname -a | grep -i CYGWIN >/dev/null if [ $? != "0" ]; then -@@ -122,6 +127,9 @@ +@@ -124,6 +129,9 @@ if [ -r "$config_dir/config" ]; then upgrading=1 fi @@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ # Check if upgrading from an old version if [ "$upgrading" = 1 ]; then echo "" -@@ -199,6 +207,10 @@ +@@ -202,6 +210,10 @@ if [ "$upgrading" = 1 ]; then else # Config directory exists .. make sure it is not in use ls $config_dir | grep -v rpmsave >/dev/null 2>&1 @@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ if [ "$?" = "0" -a "$config_dir" != "/etc/webmin" ]; then echo "ERROR: Config directory $config_dir is not empty" echo "" -@@ -528,6 +540,12 @@ +@@ -541,6 +553,12 @@ else kfile=$config_dir/miniserv.pem openssl version >/dev/null 2>&1 @@ -48,10 +48,11 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ if [ "$?" = "0" ]; then # We can generate a new SSL key for this host host=`hostname` -@@ -742,44 +760,47 @@ +@@ -762,45 +780,47 @@ EOF + echo "..done" echo "" fi - +- -echo "Changing ownership and permissions .." -# Make all config dirs non-world-readable -for m in $newmods; do @@ -73,7 +74,7 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ - chmod -R og-w "$wadir" - chmod -R a+rx "$wadir" -fi --if [ $var_dir != "/var" ]; then +-if [ $var_dir != "/var" -a "$upgrading" != 1 ]; then - # Make log directory non-world-readable or writable - chown -R root $var_dir - chgrp -R bin $var_dir @@ -114,7 +115,7 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ +# chmod -R og-w "$wadir" +# chmod -R a+rx "$wadir" +#fi -+#if [ $var_dir != "/var" ]; then ++#if [ $var_dir != "/var" -a "$upgrading" != 1 ]; then +# # Make log directory non-world-readable or writable +# chown -R root $var_dir +# chgrp -R bin $var_dir diff --git a/sysutils/webmin/patches/patch-ac b/sysutils/webmin/patches/patch-ac index 1f7ef76e9b4..44cb08913cf 100644 --- a/sysutils/webmin/patches/patch-ac +++ b/sysutils/webmin/patches/patch-ac @@ -1,32 +1,15 @@ -$NetBSD: patch-ac,v 1.5 2012/11/02 19:02:51 shattered Exp $ +$NetBSD: patch-ac,v 1.5.34.1 2017/02/12 15:28:37 spz Exp $ ---- 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 &ui_form_start("delete_packs.cgi", "post"); - print &ui_hidden("search", $in{'search'}); - @tds = ( "width=5" ); + +--- software/search.cgi.orig 2016-10-03 12:34:48.000000000 +0900 ++++ software/search.cgi 2016-11-12 07:47:09.000000000 +0900 @@ -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, &ui_link("edit_pack.cgi?search=$s&package=". ++ push(@cols, &ui_link("edit_pack.cgi?search=" . ++ &urlize($s) . "&package=". &urlize($packages{$i,'name'})."&version=". - &urlize($packages{$i,'version'})."\">".&html_escape( - $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"; - } - - &ui_print_footer("", $text{'index_return'}); + &urlize($packages{$i,'version'}), &html_escape( + $packages{$i,'name'}.($v ? " $v" : "")) ) ); diff --git a/sysutils/webmin/patches/patch-ag b/sysutils/webmin/patches/patch-ag index c9895df08eb..9c1982b9af6 100644 --- a/sysutils/webmin/patches/patch-ag +++ b/sysutils/webmin/patches/patch-ag @@ -1,8 +1,10 @@ -$NetBSD: patch-ag,v 1.4 2012/11/02 19:02:51 shattered Exp $ +$NetBSD: patch-ag,v 1.4.34.1 2017/02/12 15:28:37 spz Exp $ ---- proc/module.info.orig 2012-01-22 00:47:19.000000000 +0000 -+++ proc/module.info -@@ -12,7 +12,7 @@ desc_ko_KR.UTF-8=실행중인 프로세 +Add dragonfly + +--- proc/module.info.orig 2016-10-03 12:39:36.000000000 +0900 ++++ proc/module.info 2016-11-12 07:51:12.000000000 +0900 +@@ -13,7 +13,7 @@ desc_ko_KR.UTF-8=실행중인 프로세 name=Process Manager desc_tr=alan Sreler desc_de=Laufende Prozesse @@ -10,4 +12,4 @@ $NetBSD: patch-ag,v 1.4 2012/11/02 19:02:51 shattered Exp $ +os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows dragonfly desc_zh_CN=̹ risk=medium high - desc_pl.UTF-8=Działające procesy + longdesc_ca=Llista, mata i canvia la prioritat dels processos en execuci al sistema. |