Your message dated Fri, 22 Mar 2013 13:47:31 +0000 with message-id <[email protected]> and subject line Bug#700944: fixed in devscripts 2.13.1 has caused the Debian Bug report #700944, regarding Patch for clean_comments() in licensecheck.pl 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 this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 700944: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700944 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: devscripts Version: 2.13.0 Severity: normal That last version 2.13.0 of licensecheck.pl showed a bug, on the attached file "min_dihedral_angle.h". That file is part of CGAL-4.1, and should be detected as GPLv3+, instead of UNKNOWN. The bug is in the generic detection of comments, in clean_comments(). There is a regular expression, that detects potential comments. The pattern length is computed from the last match of the regular expression. In the case of the attached file "min_dihedral_angle.h", the last match is the last "/" in the following lines (line 50): return CGAL::sqrt(sq_distance(p0, p1)) / area(make_triangle(p0, p1, p3)) / area(make_triangle(p0, p1, p2)); That is obviously not a C++ comment. The attached patch "0001-Fix-clean_comments.patch" computes the length of the pattern from the *first* match, instead of the last one. That fixes the bug. -- Laurent Rineau, PhD R&D Engineer at GeometryFactory http://www.geometryfactory.com/ Release Manager of the CGAL Project http://www.cgal.org/// Copyright (c) 2007-2009 INRIA Sophia-Antipolis (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the GNU // General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. // // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. // // $URL: svn+ssh://scm.gforge.inria.fr/svn/cgal/branches/releases/CGAL-4.1-branch/Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h $ // $Id: min_dihedral_angle.h 67117 2012-01-13 18:14:48Z lrineau $ // // // Author(s) : Laurent RINEAU, Stephane Tayeb #ifndef CGAL_MESH_3_MIN_DIHEDRAL_ANGLE_H #define CGAL_MESH_3_MIN_DIHEDRAL_ANGLE_H #include <CGAL/Mesh_3/dihedral_angle_3.h> #include <cmath> namespace CGAL { namespace Mesh_3 { namespace details { template <typename K> typename K::FT min_dihedral_angle_aux_compute_quotient(const typename K::Point_3& p0, const typename K::Point_3& p1, const typename K::Point_3& p2, const typename K::Point_3& p3, K k = K()) { typename K::Construct_triangle_3 make_triangle = k.construct_triangle_3_object(); typename K::Compute_area_3 area = k.compute_area_3_object(); typename K::Compute_squared_distance_3 sq_distance = k.compute_squared_distance_3_object(); return CGAL::sqrt(sq_distance(p0, p1)) / area(make_triangle(p0, p1, p3)) / area(make_triangle(p0, p1, p2)); } } // end namespace details;>From fb51184791246022e6d81e0bb97831a0f4ec3516 Mon Sep 17 00:00:00 2001 From: Laurent Rineau <[email protected]> Date: Tue, 19 Feb 2013 15:08:17 +0100 Subject: [PATCH 1/2] Fix clean_comments() The detection of the comments pattern was using the last match of the regular expression. That is better to use the first one. --- scripts/licensecheck.pl | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl index 8d31626..ba9a2f2 100755 --- a/scripts/licensecheck.pl +++ b/scripts/licensecheck.pl @@ -353,16 +353,17 @@ sub parse_copyright { sub clean_comments { local $_ = shift or return q{}; + my $first_match; # Remove generic comments: look for 4 or more lines beginning with # regular comment pattern and trim it. Fall back to old algorithm # if no such pattern found. - if( 4 <= scalar(()=m{ ^\s* + if( 4 <= scalar(($first_match)=m{ ^\s* ([^a-zA-Z0-9\s]{1,3}) \s\w }xmg) ){ - my $comment_length=length($1); + my $comment_length=length($first_match); my $comment_re=qr{\s* [$1]{${comment_length}} \s*}x; s/^$comment_re//mg; } -- 1.7.7.6
--- End Message ---
--- Begin Message ---Source: devscripts Source-Version: 2.13.1 We believe that the bug you reported is fixed in the latest version of devscripts, which is due to be installed in the Debian FTP archive. 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. Benjamin Drung <[email protected]> (supplier of updated devscripts 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: SHA512 Format: 1.8 Date: Fri, 22 Mar 2013 14:39:13 +0100 Source: devscripts Binary: devscripts Architecture: source amd64 Version: 2.13.1 Distribution: experimental Urgency: low Maintainer: Devscripts Devel Team <[email protected]> Changed-By: Benjamin Drung <[email protected]> Description: devscripts - scripts to make the life of a Debian Package maintainer easier Closes: 679631 680313 700938 700944 702610 703323 Changes: devscripts (2.13.1) experimental; urgency=low . [ Laurent Rineau ] * licensecheck: - Fix the detection of (L|A)GPL. (Closes: #700938) - Fix comments pattern detection. (Closes: #700944) . [ Benjamin Drung ] * wnpp-check: Correct download links to fix regression from previous release. * Switch to debhelper 9. * Convert Python scripts to python3 (Closes: #680313). * Move git repository to collab-maint. * Remove Julian Gilbey, Mohammed Adnène Trojette, Christoph Berg, Stefano Zacchiroli, Adam D. Barratt, and Luk Claes from uploaders list. Thanks for your work. . [ James McCoy ] * debdiff: Handle control files with odd permissions. Thanks to Julian Gilbey for the patch. (Closes: #702610) * mk-build-deps: Skip malformed stanzas instead of outright failing. (Closes: #679631) . [ Dmitrijs Ledkovs ] * wrap-and-sort: Add trailing comma option (Closes: #703323). . [ Markus Wanner ] * uscan: more debug info to allow checking uversionmangle patterns. Checksums-Sha1: 98de95719b17d95b83bf7bc25c60622970c692fc 2097 devscripts_2.13.1.dsc adf69303d837f2098dc9ca9de07fb72b2f255a4f 565204 devscripts_2.13.1.tar.xz e70302fd1c933ac367153ca0c560908fed31e150 909174 devscripts_2.13.1_amd64.deb Checksums-Sha256: 5e0a257405b2360b9883dee55edd89bd495db70ebb6c735ae0b0a2215fa45f22 2097 devscripts_2.13.1.dsc 89b39896e029addd155ca55debdca091f49fc73e1d87a40c5fea09c27525d50e 565204 devscripts_2.13.1.tar.xz 1ac87e4cc5312d3f70a4ff50956b7a4873486562b54a9cbbc3cb1ced5bccd348 909174 devscripts_2.13.1_amd64.deb Files: a15861c5190776a4095efc77c0a37700 2097 devel optional devscripts_2.13.1.dsc 953180e0fb14246a34e442f9843ba06c 565204 devel optional devscripts_2.13.1.tar.xz 592821825402b70ce0f379281aec17ac 909174 devel optional devscripts_2.13.1_amd64.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCgAGBQJRTGB4AAoJEBWetcTvyHdMzMMP/1RwA0Zy7te38kIn91PWYjMA UCvDdmCUiMr+fFRQqFf7xcPQxcoUc/BQmuNL6qEAccFRctLef9VDw2DhMtiKzIO5 tg+Nca3/f8HzsmSjUi6V/XAz8IYVzL9XCTxniewkYKgS93Y/eouP+PBWeNJUSCr4 GJf86tuPIN9cdGH0a+gEQU/bMmgi+O1qNPUH0/TbFijtfNo/4lGSnhwag8FgKm8t pLY+17/8P9qZXPwj9ivOX4XGuShqs77dzwuK0D54karU1Q4sbhgc0n8denbBnY7c 8X8bqgtSu4KKdK5BN5B7tOZ8qVVH8XrQ9GWgPwyZ9ZcOCK8BqUt1kWyiADrelnbP yVw31T2mB9MSNJlJQ13cWtSZwqz1CeFBqo4UJQB1XpiRffttH2C44n3LWK24AccS lCc3nvM15TuJS3GG14Ou5plL6HE58Nc4XhaDz+gxwALoeOx6ZpBRRRXkIezR3NSC YwH9t1P54c76BTdL2CqpFTHHyXTkq7OT26ImBedGW+j2km9Ohvhi50BH6M2DQ1vu jbsBnlRVoreasWjlzhahMk7umoNsObDlSTRmzD0oFTe+CSPhodSQ4WcSoXey454Q cSq3aYSbr/ZJuavMrse2Bl+T3K+2gmW+SPRfFEUd4XRov00lAts/k46mKW3/JOb+ Cn37EngsTvIKOsd5pcXb =fmhv -----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
