r67081 - in /branches/upstream/libquota-perl/current: CHANGES META.yml Quota.pm Quota.xs README

[periapt-guest at users.alioth.debian.org]

Author: periapt-guest
Date: Wed Jan  5 22:02:02 2011
New Revision: 67081

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=67081
Log:
[svn-upgrade] new version libquota-perl (1.6.5+dfsg)

Modified:
    branches/upstream/libquota-perl/current/CHANGES
    branches/upstream/libquota-perl/current/META.yml
    branches/upstream/libquota-perl/current/Quota.pm
    branches/upstream/libquota-perl/current/Quota.xs
    branches/upstream/libquota-perl/current/README

Modified: branches/upstream/libquota-perl/current/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libquota-perl/current/CHANGES?rev=67081&op=diff
==============================================================================
--- branches/upstream/libquota-perl/current/CHANGES (original)
+++ branches/upstream/libquota-perl/current/CHANGES Wed Jan  5 22:02:02 2011
@@ -1,3 +1,7 @@
+Changes in 1.6.5 (January 2011)
+- Fixed syntax error and missing init for params to setqlim()
+  Thanks to Heinrich Mislik for reporting the bugs
+
 Changes in 1.6.4 (January 2010)
 - Fixed RPC quota block count truncation to 32bit (CPAN ticket 52813 )
   Thanks to Lloyd Brown for reporting the bug

Modified: branches/upstream/libquota-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libquota-perl/current/META.yml?rev=67081&op=diff
==============================================================================
--- branches/upstream/libquota-perl/current/META.yml (original)
+++ branches/upstream/libquota-perl/current/META.yml Wed Jan  5 22:02:02 2011
@@ -1,7 +1,7 @@
 --- #YAML:1.0
 name: Quota
 abstract: Quota - Perl interface to file system quotas
-version: 1.6.4
+version: 1.6.5
 author:
   - Tom Zoerner <tomzo at users.sourceforge.net>
 license: perl

Modified: branches/upstream/libquota-perl/current/Quota.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libquota-perl/current/Quota.pm?rev=67081&op=diff
==============================================================================
--- branches/upstream/libquota-perl/current/Quota.pm (original)
+++ branches/upstream/libquota-perl/current/Quota.pm Wed Jan  5 22:02:02 2011
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------ #
-# Quota.pm - Copyright (C) 1995-2010 Tom Zoerner
+# Quota.pm - Copyright (C) 1995-2011 Tom Zoerner
 # ------------------------------------------------------------------------ #
 # This program is free software: you can redistribute it and/or modify
 # it either under the terms of the Perl Artistic License or the GNU
@@ -22,7 +22,7 @@
 @ISA = qw(Exporter DynaLoader);
 @EXPORT = ();
 
-$VERSION = '1.6.4';
+$VERSION = '1.6.5';
 
 bootstrap Quota;
 

Modified: branches/upstream/libquota-perl/current/Quota.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libquota-perl/current/Quota.xs?rev=67081&op=diff
==============================================================================
--- branches/upstream/libquota-perl/current/Quota.xs (original)
+++ branches/upstream/libquota-perl/current/Quota.xs Wed Jan  5 22:02:02 2011
@@ -176,6 +176,7 @@
   case Q_OK:
     {
       struct timeval tv;
+      int qb_fac;
 
       gettimeofday(&tv, NULL);
 #ifdef LINUX_RQUOTAD_BUG
@@ -196,18 +197,18 @@
         dqp->QS_BSOFT = gq_rslt.GQR_RQUOTA.rq_bsoftlimit;
         dqp->QS_BCUR = gq_rslt.GQR_RQUOTA.rq_curblocks;
 
-	/* we rely on the fact that block sizes are always powers of 2 */
-	/* so the conversion factor will never be a fraction */
-        int qb_fac = gq_rslt.GQR_RQUOTA.rq_bsize / DEV_QBSIZE;
-	dqp->QS_BHARD *= qb_fac;
-	dqp->QS_BSOFT *= qb_fac;
-	dqp->QS_BCUR *= qb_fac;
+        /* we rely on the fact that block sizes are always powers of 2 */
+        /* so the conversion factor will never be a fraction */
+        qb_fac = gq_rslt.GQR_RQUOTA.rq_bsize / DEV_QBSIZE;
+        dqp->QS_BHARD *= qb_fac;
+        dqp->QS_BSOFT *= qb_fac;
+        dqp->QS_BCUR *= qb_fac;
       }
       else {
-        int qb_fac = DEV_QBSIZE / gq_rslt.GQR_RQUOTA.rq_bsize;
-	dqp->QS_BHARD = gq_rslt.GQR_RQUOTA.rq_bhardlimit / qb_fac;
-	dqp->QS_BSOFT = gq_rslt.GQR_RQUOTA.rq_bsoftlimit / qb_fac;
-	dqp->QS_BCUR = gq_rslt.GQR_RQUOTA.rq_curblocks / qb_fac;
+        qb_fac = DEV_QBSIZE / gq_rslt.GQR_RQUOTA.rq_bsize;
+        dqp->QS_BHARD = gq_rslt.GQR_RQUOTA.rq_bhardlimit / qb_fac;
+        dqp->QS_BSOFT = gq_rslt.GQR_RQUOTA.rq_bsoftlimit / qb_fac;
+        dqp->QS_BCUR = gq_rslt.GQR_RQUOTA.rq_curblocks / qb_fac;
       }
 #endif /* LINUX_RQUOTAD_BUG */
       dqp->QS_FHARD = gq_rslt.GQR_RQUOTA.rq_fhardlimit;
@@ -562,6 +563,7 @@
           else
 #endif /* HAVE_JFS2 */
 	  {
+            memset(&dqblk, 0, sizeof(dqblk));
 	    dqblk.QS_BSOFT = Q_MUL(bs);
 	    dqblk.QS_BHARD = Q_MUL(bh);
 	    dqblk.QS_BTIME = timelimflag;

Modified: branches/upstream/libquota-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libquota-perl/current/README?rev=67081&op=diff
==============================================================================
--- branches/upstream/libquota-perl/current/README (original)
+++ branches/upstream/libquota-perl/current/README Wed Jan  5 22:02:02 2011
@@ -3,8 +3,8 @@
 
 Author:    Tom Zoerner (tomzo AT users.sourceforge.net)
 
-Version:   1.6.4
-Date:      January 2010
+Version:   1.6.5
+Date:      January 2011
 DLSIP-Code:Rcdfg
            - stable release
            - C compiler required for installation