Date: Mon, 13 Feb 2012 20:15:22 +0100 From: Remko Lodder <remko@elvandar.org> To: Jimmy Olgeni <olgeni@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/sysutils/webmin Makefile distinfo ports/sysutils/webmin/files patch-aa patch-ajaxterm_ajaxterm_ajaxterm.py Message-ID: <E7CCAFE3-0008-4D91-98FD-5DA381E84F35@elvandar.org> In-Reply-To: <201202131324.q1DDOD1u060965@repoman.freebsd.org> References: <201202131324.q1DDOD1u060965@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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, | remko@elvandar.org
\ / Remko Lodder | remko@FreeBSD.org
X FreeBSD | http://www.evilcoder.org
/ \ The Power to Serve | Quis custodiet ipsos custodes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E7CCAFE3-0008-4D91-98FD-5DA381E84F35>