On Feb 13, 2012, at 2:24 PM, Jimmy Olgeni wrote:
> olgeni 2012-02-13 13:24:13 UTC
>
> FreeBSD ports repository
>
> Modified files:
> sysutils/webmin Makefile distinfo
> sysutils/webmin/files patch-aa
> Added files:
> sysutils/webmin/files patch-ajaxterm_ajaxterm_ajaxterm.py
> Log:
> Upgrade to version 1.580.
>
Please note that people using Webmin and Virtualmin (GPL) together _and_
running on FreeBSD9
are not able to use the Quota module. A fix had been written by jcameron and
the diff is pasted below
in case you want to use it (it will be fixed in 1.590!)
--- freebsd-lib.pl.20120210 2012-02-03 21:16:59.000000000 +0100
+++ freebsd-lib.pl 2012-02-10 07:57:43.000000000 +0100
@@ -240,11 +240,17 @@
@line = split(/\n/, $_[0]);
for($i=0; $i<@line; $i++) {
if ($line[$i] =~ /^(\S+): (blocks|kbytes) in use: (\d+), limits \(soft
= (\d+), hard = (\d+)\)$/ && $1 eq $_[1]) {
- # found lines to change
+ # found lines to change, old style
$rv .= "$1: $2 in use: $3, limits (soft = $_[2], hard =
$_[3])\n";
$line[++$i] =~ /^\s*inodes in use: (\d+), limits \(soft =
(\d+), hard = (\d+)\)$/;
$rv .= "\tinodes in use: $1, limits (soft = $_[4], hard =
$_[5])\n";
}
+ elsif ($line[$i] =~ /^(\S+): in use: (\d+)k, limits \(soft = (\d+)k,
hard = (\d+)k\)$/ && $1 eq $_[1]) {
+ # found lines to change, new style
+ $rv .= "$1: in use: ${2}k, limits (soft = $_[2]k, hard =
$_[3]k)\n";
+ $line[++$i] =~ /^\s*inodes in use: (\d+), limits \(soft =
(\d+), hard = (\d+)\)$/;
+ $rv .= "\tinodes in use: $1, limits (soft = $_[4], hard =
$_[5])\n";
+ }
else { $rv .= "$line[$i]\n"; }
}
return $rv;
--
/"\ With kind regards, | [email protected]
\ / Remko Lodder | [email protected]
X FreeBSD | http://www.evilcoder.org
/ \ The Power to Serve | Quis custodiet ipsos custodes
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "[email protected]"
