From owner-cvs-all@FreeBSD.ORG Mon Feb 13 19:15:26 2012 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0D6C10656D3; Mon, 13 Feb 2012 19:15:26 +0000 (UTC) (envelope-from remko@elvandar.org) Received: from mailgate.jr-hosting.nl (mail.jr-hosting.nl [IPv6:2a01:4f8:141:5061::25]) by mx1.freebsd.org (Postfix) with ESMTP id E7E238FC18; Mon, 13 Feb 2012 19:15:25 +0000 (UTC) Received: from [IPv6:2001:470:d701::15aa:f7fd:52d5:ad71] (unknown [IPv6:2001:470:d701:0:15aa:f7fd:52d5:ad71]) by mailgate.jr-hosting.nl (Postfix) with ESMTPSA id C726A3F46E; Mon, 13 Feb 2012 20:15:23 +0100 (CET) Mime-Version: 1.0 (Apple Message framework v1257) From: Remko Lodder In-Reply-To: <201202131324.q1DDOD1u060965@repoman.freebsd.org> Date: Mon, 13 Feb 2012 20:15:22 +0100 Message-Id: References: <201202131324.q1DDOD1u060965@repoman.freebsd.org> To: Jimmy Olgeni X-Mailer: Apple Mail (2.1257) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.5 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 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2012 19:15:26 -0000 On Feb 13, 2012, at 2:24 PM, Jimmy Olgeni wrote: > olgeni 2012-02-13 13:24:13 UTC >=20 > FreeBSD ports repository >=20 > Modified files: > sysutils/webmin Makefile distinfo=20 > sysutils/webmin/files patch-aa=20 > Added files: > sysutils/webmin/files patch-ajaxterm_ajaxterm_ajaxterm.py=20 > Log: > Upgrade to version 1.580. >=20 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 =3D split(/\n/, $_[0]); for($i=3D0; $i<@line; $i++) { if ($line[$i] =3D~ /^(\S+): (blocks|kbytes) in use: (\d+), = limits \(soft =3D (\d+), hard =3D (\d+)\)$/ && $1 eq $_[1]) { - # found lines to change + # found lines to change, old style $rv .=3D "$1: $2 in use: $3, limits (soft =3D $_[2], = hard =3D $_[3])\n"; $line[++$i] =3D~ /^\s*inodes in use: (\d+), limits = \(soft =3D (\d+), hard =3D (\d+)\)$/; $rv .=3D "\tinodes in use: $1, limits (soft =3D $_[4], = hard =3D $_[5])\n"; } + elsif ($line[$i] =3D~ /^(\S+): in use: (\d+)k, limits \(soft =3D = (\d+)k, hard =3D (\d+)k\)$/ && $1 eq $_[1]) { + # found lines to change, new style + $rv .=3D "$1: in use: ${2}k, limits (soft =3D $_[2]k, = hard =3D $_[3]k)\n"; + $line[++$i] =3D~ /^\s*inodes in use: (\d+), limits = \(soft =3D (\d+), hard =3D (\d+)\)$/; + $rv .=3D "\tinodes in use: $1, limits (soft =3D $_[4], = hard =3D $_[5])\n"; + } else { $rv .=3D "$line[$i]\n"; } } return $rv; --=20 /"\ 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