Your message dated Fri, 09 Sep 2005 13:47:51 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#309729: fixed in horde3 3.0.5-1
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 19 May 2005 05:09:40 +0000
>From [EMAIL PROTECTED] Wed May 18 22:09:40 2005
Return-path: <[EMAIL PROTECTED]>
Received: from adsl-67-39-5-57.dsl.dytnoh.ameritech.net
(santiago.familiasanchez.net) [67.39.5.57]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1DYdHw-0003HU-00; Wed, 18 May 2005 22:09:40 -0700
Received: by santiago.familiasanchez.net (Postfix, from userid 1000)
id D3C8A6009A3; Thu, 19 May 2005 01:09:38 -0400 (EDT)
Content-Type: multipart/mixed; boundary="===============0871507252=="
MIME-Version: 1.0
From: "Roberto C. Sanchez" <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: horde3: Patch to fix problem viewing CVS/SVN comments with chora2
X-Mailer: reportbug 3.8
Date: Thu, 19 May 2005 01:09:38 -0400
Message-Id: <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
This is a multi-part MIME message sent by reportbug.
--===============0871507252==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Package: horde3
Version: 3.0.4-4
Severity: normal
Tags: patch
Ola,
Here is the patch I promised that fixes the problem with viewing CVS and
subversion log comments in chora2.
----------8< Start here >8----------
diff -ur horde3-3.0.4/lib/Horde/VC/cvs.php horde3-3.0.4.new/lib/Horde/VC/cvs.php
--- horde3-3.0.4/lib/Horde/VC/cvs.php 2005-03-29 05:59:56.000000000 -0500
+++ horde3-3.0.4.new/lib/Horde/VC/cvs.php 2005-04-30 21:13:34.000000000
-0400
@@ -7,7 +7,7 @@
*
* Copyright 2000-2005 Anil Madhavapeddy, <[EMAIL PROTECTED]>
*
- * $Horde: framework/VC/VC/cvs.php,v 1.32.2.5 2005/02/02 18:46:04 chuck Exp $
+ * $Horde: framework/VC/VC/cvs.php,v 1.32.2.7 2005/05/01 01:13:34 chuck Exp $
*
* @author Anil Madhavapeddy <[EMAIL PROTECTED]>
* @package VC
@@ -593,7 +593,7 @@
* @var integer $cacheVersion
*/
$cacheVersion = 2;
- $cacheId = $filename . '_f' . (int)$quicklog . '_v' . $cacheVersion;
+ $cacheId = $rep->sourceroot() . '_n' . $filename . '_f' .
(int)$quicklog . '_v' . $cacheVersion;
if ($cache &&
$cache->exists($cacheId, time() - @filemtime($filename . ',v'))) {
@@ -789,7 +789,7 @@
} else {
$symrev[$regs[1]] = $regs[2];
if (empty($revsym[$regs[2]]))
$revsym[$regs[2]]=array();
- array_push($revsym[$regs[2]], $regs[1]);
+ $revsym[$regs[2]][] = $regs[1];
}
}
break;
@@ -804,7 +804,7 @@
$err = $log->processLog($accum);
// TODO: error checks - avsm
$this->logs[$log->queryRevision()] = &$log;
- array_push($this->revs, $log->queryRevision());
+ $this->revs[] = $log->queryRevision();
$accum = array();
}
break;
@@ -1000,7 +1000,7 @@
* @var integer $cacheVersion
*/
$cacheVersion = 1;
- $cacheId = $filename . '_f' . '_v' . $cacheVersion;
+ $cacheId = $rep->sourceroot() . '_n' . $filename . '_f_v' .
$cacheVersion;
if ($cache &&
$cache->exists($cacheId, time() - @filemtime($filename . ',v'))) {
diff -ur horde3-3.0.4/lib/Horde/VC/svn.php horde3-3.0.4.new/lib/Horde/VC/svn.php
--- horde3-3.0.4/lib/Horde/VC/svn.php 2005-03-29 05:59:56.000000000 -0500
+++ horde3-3.0.4.new/lib/Horde/VC/svn.php 2005-05-06 05:32:43.000000000
-0400
@@ -4,7 +4,7 @@
*
* Copyright 2000-2005 Anil Madhavapeddy, <[EMAIL PROTECTED]>
*
- * $Horde: framework/VC/VC/svn.php,v 1.28.4.4 2005/01/13 04:36:58 chuck Exp $
+ * $Horde: framework/VC/VC/svn.php,v 1.28.4.6 2005/05/06 09:32:43 jan Exp $
*
* @author Anil Madhavapeddy <[EMAIL PROTECTED]>
* @since Horde 3.0
@@ -476,7 +476,7 @@
* @var integer $cacheVersion
*/
$cacheVersion = 2;
- $cacheId = $filename . '_f' . (int)$quicklog . '_v' . $cacheVersion;
+ $cacheId = $rep->sourceroot() . '_n' . $filename . '_f' .
(int)$quicklog . '_v' . $cacheVersion;
if ($cache &&
// The file is cached for one hour no matter what, because
@@ -726,7 +726,7 @@
return false;
}
- if (preg_match('/^r([0-9]*) \| ([^ ]*) \| (.*) \(.*\) \| ([0-9]*)
lines?$/', $line, $matches)) {
+ if (preg_match('/^r([0-9]*) \| (.*?) \| (.*) \(.*\) \| ([0-9]*)
lines?$/', $line, $matches)) {
$this->rev = $matches[1];
$this->author = $matches[2];
$this->date = strtotime($matches[3]);
@@ -837,7 +837,7 @@
* @var integer $cacheVersion
*/
$cacheVersion = 1;
- $cacheId = $filename . '_f_v' . $cacheVersion;
+ $cacheId = $rep->sourceroot() . '_n' . $filename . '_f_v' .
$cacheVersion;
if ($cache &&
// The file is cached for one hour no matter what, because
----------8< End here >8----------
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.4.28-rc3-santiago-1
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
Versions of packages horde3 depends on:
ii apache [httpd] 1.3.33-4 versatile, high-performance HTTP s
ii libapache-mod-php4 [phpapi-2 4:4.3.10-13 server-side, HTML-embedded scripti
ii php4 4:4.3.10-13 server-side, HTML-embedded scripti
ii php4-cgi [phpapi-20020918] 4:4.3.10-13 server-side, HTML-embedded scripti
ii php4-cli [phpapi-20020918] 4:4.3.10-13 command-line interpreter for the p
ii php4-domxml 4:4.3.10-13 XMLv2 module for php4
ii php4-pear 4:4.3.10-13 PEAR - PHP Extension and Applicati
ii php4-pear-log 1.6.0-1.1 Log module for PEAR
-- no debconf information
--===============0871507252==
Content-Type: application/octet-stream
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="horde3-chora2.patch.gz"
H4sICHwejEIAA2hvcmRlMy1jaG9yYTIucGF0Y2gA7Vffj9pGEH7u/RXzgA77wL9tDnwNIbpWaqVW
karoXgg57ZkFu4Dt7Nq+oDb/e2fX5rDPkCO5pOlDLcOa9cw3M9/Ozg7zaLEALWcQJmxOHc3RTd01
1tGd8YuYMG6ujaDgehqmDQk9pvcHpc40TXsa6wfbND3NdDR7BKbneyPfG+jm7gLN9EzzrNfrnWaz
QnM1xwTb8i3Hd9wGmotokwlol/1L6ImvyeQM4EJ84DpJtyxahhkgiqkJKHgVR2v4ncxDUpCUzufb
PvxIcG7CaJBEaz1hy7EE0BCgI93xYcHIht4nbCU82zvXL8DSHVu3dU9Y8AzTxhusoe8OfNOFIMyD
Ffz8IYXOWe9z4C4rOLwtMKuwG3C7ECckz5BIaMd1OCyYpCRYkSWFm2vJmzdyBHPlILnbXShbEAZR
nNElZdAJSBDSG8p4lMR1MWP/oyEDL8C+Qhob736d43RnEa1pjByADt3bRRcHBc2onfd5FKzWyVLO
F2K+gXiFLB5AYzTVxjzJWUBZkmSKKtVjqf7FlmAfVbQApXwL5+e1yB/c0Mb0Q8Qzruy86kMWbSg6
osFEeLCRPxvO9IuuqqrwV5m8w5FMXzk0FqF2fQS65hQ1Dr6V3vDthtFiiows+dSazUp28NmeXR1X
E/HRTZptFRQuEGO6U5qhh625F4QxslXU2to+vqTEbZrzsA3Zh517am09W6E8Vpvug7GOBfOxPX1g
6o5RsrqSvA9NV/BeDsd471DGhG3MFm2csiSgnP+WLJUOCYJ8ox7xxTDgzeufXvuA2rg/MS2CFcd8
IAXfHLGThRHXxmiGT0tj73PKtn/QIhIpqaiCgXPx5gjzddZLLEFiHw6CHSO/pllSfkj5SMwlI6j0
kCEtkU+vh4VlWixINX7tcmSdXI6+SfX5vnVm/nQ3wIv4hG6gknqiG6ikvlI30ETDeyDQHNt3nYPd
gNzW7r/UDVTOyePbHqL7bnV8W4blgOn6zsD3hid3Ay24wb4bwLBHZdjwJ4mf3QvwKA4oppf0BJDK
krzLgaRPDv+3BJ+5VUXhx2lhBSIOUmgOC1yXJKaY5rgD4wQ2JMuQwfuQZH24owHJOS1bAVuSXw6P
jyRGs5zFsCDYCNSKKxbVPanCtRTPyVs0EYRK13jHlKmpjWYXKrz9G5TpO9g96mLE77fVm0pqHcWU
v+wYXXF04DMOEotyWUh6p1rSL14+x06zAD4cS2J5K7F2J1CJVRuhJtlqgCrJOckoyvGMZUlZPHca
juhPZJPgyP8W5fB9jqT/2Gn0jBT/B0CqM6qUDgAA
--===============0871507252==--
---------------------------------------
Received: (at 309729-close) by bugs.debian.org; 9 Sep 2005 20:52:08 +0000
>From [EMAIL PROTECTED] Fri Sep 09 13:52:08 2005
Return-path: <[EMAIL PROTECTED]>
Received: from katie by spohr.debian.org with local (Exim 3.36 1 (Debian))
id 1EDpmp-0003Sx-00; Fri, 09 Sep 2005 13:47:51 -0700
From: Ola Lundqvist <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
X-Katie: $Revision: 1.56 $
Subject: Bug#309729: fixed in horde3 3.0.5-1
Message-Id: <[EMAIL PROTECTED]>
Sender: Archive Administrator <[EMAIL PROTECTED]>
Date: Fri, 09 Sep 2005 13:47:51 -0700
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-CrossAssassin-Score: 8
Source: horde3
Source-Version: 3.0.5-1
We believe that the bug you reported is fixed in the latest version of
horde3, which is due to be installed in the Debian FTP archive:
horde3_3.0.5-1.diff.gz
to pool/main/h/horde3/horde3_3.0.5-1.diff.gz
horde3_3.0.5-1.dsc
to pool/main/h/horde3/horde3_3.0.5-1.dsc
horde3_3.0.5-1_all.deb
to pool/main/h/horde3/horde3_3.0.5-1_all.deb
horde3_3.0.5.orig.tar.gz
to pool/main/h/horde3/horde3_3.0.5.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Ola Lundqvist <[EMAIL PROTECTED]> (supplier of updated horde3 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Fri, 9 Sep 2005 22:53:15 +0200
Source: horde3
Binary: horde3
Architecture: source all
Version: 3.0.5-1
Distribution: unstable
Urgency: low
Maintainer: Ola Lundqvist <[EMAIL PROTECTED]>
Changed-By: Ola Lundqvist <[EMAIL PROTECTED]>
Description:
horde3 - horde web application framework
Closes: 304186 309657 309661 309729 315571 321490 325146 325492 325727 326066
Changes:
horde3 (3.0.5-1) unstable; urgency=low
.
* New upstream release,
closes: #325146, #315571, #325727, #321490, #309729, #304186.
* Added gollem to suggest list, closes: #325492.
* Added webcpp, chora2, xlhtml, ppthtml, wv, source-highlight, enscript
and rpm to suggest list, closes: #309657, #326066.
* Patched config/mime_drivers.php.dist so that no /usr/local is used
for programs that exist in Debian archive, closes: #309661.
Files:
b709ce268f0cc0c586e3e2091d7bfe70 615 web optional horde3_3.0.5-1.dsc
31ee0819be4efe44819f8ffef5db5365 3549687 web optional horde3_3.0.5.orig.tar.gz
8a21e0049f371dabe58a5ed7d2ace648 7406 web optional horde3_3.0.5-1.diff.gz
55ed2b54e6602a5e9d4d5c9fc32b652c 3598618 web optional horde3_3.0.5-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFDIfr1GKGxzw/lPdkRAgp3AJ9ywNjm6rGi8sBU8djMa2XQvR/DswCaA3di
ieDKMwpzQnjvOaSsvrMuAKU=
=3SFl
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
