Bug#708881: GFDL
Next patch queue for lintian
From 6be9dd24ae79c5afab9366640334e06a86c5c45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sun, 19 May 2013 13:46:55 +0200
Subject: [PATCH 14/19] Allow break at hyphen for detection of gfdl
front-cover could be written as front-\ncover. Allow it.
---
checks/cruft | 4 ++--
.../debian/src/normalwithbreakathyphen.texi | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/normalwithbreakathyphen.texi
diff --git a/checks/cruft b/checks/cruft
index 8117a1f..2c316e1 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -489,8 +489,8 @@ sub find_cruft {
# explicitly states it has no "bad sections".
given($+{gfdlsections}) {
when(m/no $s+ Invariant $s+ Sections?,?
- $s+ (?:with$s+)? (?:the$s+)? no $s+ Front-Cover $s+ Texts?,? $s+ (?:and$s+)?
- (?:with$s+)? (?:the$s+)? no $s+ Back-Cover $s+ Texts?/xiso) {
+ $s+ (?:with$s+)? (?:the$s+)? no $s+ Front-$s*Cover $s+ Texts?,? $s+ (?:and$s+)?
+ (?:with$s+)? (?:the$s+)? no $s+ Back-$s*Cover $s+ Texts?/xiso) {
# no invariant
}
when(m/no $s+ Invariant $s+ Sections?,?
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/normalwithbreakathyphen.texi b/t/tests/cruft-gfdl-invariants/debian/src/normalwithbreakathyphen.texi
new file mode 100644
index 0000000..22ae575
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/normalwithbreakathyphen.texi
@@ -0,0 +1,8 @@
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+version 1.3 or any later version published by the Free Software
+Foundation; with no Invariant Sections, no Front-
+Cover Texts and
+no Back-
+Cover Texts. A copy of the license is included in the
+section entitled "GNU Free Documentation License".
--
1.7.10.4
From 46e7b998f0b55b0c948214f20a046243f268d103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sun, 19 May 2013 15:37:00 +0200
Subject: [PATCH 15/19] Fix gnash false positive
Gnash does not follow classical gfdl pattern. Allow this.
---
checks/cruft | 19 +++++++++++++++++--
.../debian/src/gnashfalsepositive.html | 20 ++++++++++++++++++++
.../debian/src/gnashfalsepositive.info | 14 ++++++++++++++
.../debian/src/gnashfalsepositive.xml | 15 +++++++++++++++
.../debian/src/gnashfalsepositive2.html | 15 +++++++++++++++
5 files changed, 81 insertions(+), 2 deletions(-)
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.html
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.info
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.xml
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive2.html
diff --git a/checks/cruft b/checks/cruft
index 2c316e1..b33254c 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -481,10 +481,12 @@ sub find_cruft {
#
# See cruft-gfdl-fp-sliding-win for the test case
when(m/GNU (?:\s+|\s*<\/span>\s*)? Free \s+ Documentation \s+ License (?'gfdlsections'.{0,1024})
- A \s+ copy \s+ of \s+ the \s+ license \s+ is \s+ included/xis) {
+ (?:A \s+ copy \s+ of \s+ the \s+ license \s+ is \s+ included|You \s+ can \s+ find \s+ a \s+ copy \s+ of \s+ the \s+ GFDL)/xis) {
if (!exists $licenseproblemhash{'gfdl-invariants'}) {
# local space
my $s = '(?:\s|\@c|%|\n\+|\n-|\n!|\n<|\n>|<br\s?/>|\n\.\\\"|\*|\"|,\")';
+ # html or info file with link
+ my $sl = '(?:\s*|\s*<a\s.*?>\s*|\s*</a>\s*|\s*<link.*?>\s*|\s*</link>\s*|\s*\(\*note\s.*?::\)\s*)';
# GFDL license, assume it is bad unless it
# explicitly states it has no "bad sections".
given($+{gfdlsections}) {
@@ -493,6 +495,11 @@ sub find_cruft {
(?:with$s+)? (?:the$s+)? no $s+ Back-$s*Cover $s+ Texts?/xiso) {
# no invariant
}
+ when(m/no $sl Invariant $s+ Sections? $sl ,?
+ \s+ (?:with$s+)? (?:the$s+)? no $sl Front-$s*Cover $s+ Texts? $sl,? $s+ (?:and$s+)?
+ (?:with$s+)? (?:the$s+)? no $sl Back-$s*Cover $s+ Texts?/xiso) {
+ # no invariant with link
+ }
when(m/no $s+ Invariant $s+ Sections?,?
$s+ (?:no$s+)? Front-? $s+ or
$s+ (?:no$s+)? Back-Cover $s+ Texts?/xiso) {
@@ -506,6 +513,14 @@ sub find_cruft {
$s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)?/xiso) {
# verbatim text of license is ok
}
+ when(m/with $s+ the $sl Invariant $s+ Sections $sl being
+ $s+ (?:\@var\{|<var>)? LIST $s+ THEIR $s+TITLES (?:\}|<\/var>)? $s* ,?
+ $s+ with $s+ the $sl Front-Cover $s+ Texts $sl being
+ $s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)? $s* ,?
+ $s+ and $s+ with $s+ the $sl Back-Cover $s+ Texts $sl being
+ $s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)?/xiso) {
+ # verbatim text with link of license is ok
+ }
when(m/\A $s* (?:(?:\,|\.|;)$s*)? version $s+ \d+(?:\.\d+)? $s+
(?:or $s+ any $s+ later $s+ version $s+)?
published $s+ by $s+ the $s+ Free $s+ Software $s+ Foundation $s*
@@ -516,7 +531,7 @@ sub find_cruft {
$licenseproblemhash{'gfdl-invariants'} = 1;
}
default {
- tag 'license-problem-gfdl-invariants', $name;
+ tag 'license-problem-gfdl-invariants', $name;#, $+{gfdlsections};
$licenseproblemhash{'gfdl-invariants'} = 1;
}
}
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.html b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.html
new file mode 100644
index 0000000..297e493
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.html
@@ -0,0 +1,20 @@
+<html>
+<body>
+
+<div>
+<p class="copyright">Copyright 2005, 2006, 2007, 2008 Free Software Foundation</p>
+</div>
+<div>
+<div class="legalnotice"><a name="legalnotice"></a>
+<p>
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the <a class="link" href="#fdl" title="Appendix<A0>A.<A0>GNU Free Documentation License"><em class="citetitle">GNU
+ Free Documentation License</em></a>, Version 1.1 or any later
+ version published by the Free Software Foundation with no Invariant
+ Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find
+ a copy of the GFDL at this <a class="link" href="#fdl" title="Appendix<A0>A.<A0>GNU Free Documentation License">link</a> or in the file COPYING-DOCS
+ distributed with this manual.
+</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.info b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.info
new file mode 100644
index 0000000..cc7a754
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.info
@@ -0,0 +1,14 @@
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+Copyright 2008, Free Software Foundation.
+
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+version 1.1 or any later version published by the Free Software
+Foundation; with noInvariant Sections (*note fdl-invariant::),
+with no Front-Cover Texts (*note fdl-cover-texts::), and with no
+Back-Cover Texts (*note fdl-cover-texts::). A copy of the license
+is included in the section entitled "GNU Free Documentation
+License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.xml b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.xml
new file mode 100644
index 0000000..d4b5f97
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.xml
@@ -0,0 +1,15 @@
+<html>
+<body>
+<div class="blockquote"><blockquote class="blockquote"><p>
+ Copyright 2008, Free Software Foundation.
+ </p><p>
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation
+ License, Version 1.1 or any later version published by the
+ Free Software Foundation; with no<link class="link" href="#fdl-invariant">Invariant Sections</link>, with no <link class="link" href="#fdl-cover-texts">Front-Cover Texts</link>,
+ and with no <a class="link" href="#fdl-cover-texts">Back-Cover
+ Texts</a>. A copy of the license is included in
+ the section entitled "GNU Free Documentation License".
+</p></blockquote></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive2.html b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive2.html
new file mode 100644
index 0000000..cac9aba
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive2.html
@@ -0,0 +1,15 @@
+<html>
+<body>
+<div class="blockquote"><blockquote class="blockquote"><p>
+ Copyright 2008, Free Software Foundation.
+ </p><p>
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation
+ License, Version 1.1 or any later version published by the
+ Free Software Foundation; with no<a class="link" href="#fdl-invariant">Invariant Sections</a>, with no <a class="link" href="#fdl-cover-texts">Front-Cover Texts</a>,
+ and with no <a class="link" href="#fdl-cover-texts">Back-Cover
+ Texts</a>. A copy of the license is included in
+ the section entitled "GNU Free Documentation License".
+</p></blockquote></div>
+</body>
+</html>
\ No newline at end of file
--
1.7.10.4
From eb163c426195d56074713e8c9b2bd0dc3ab36cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sun, 19 May 2013 15:40:09 +0200
Subject: [PATCH 16/19] Move false positive to their own directory
---
.../debian/src/diveintopythonok.html | 12 ------------
.../cruft-gfdl-invariants/debian/src/findutilsok.c | 15 ---------------
.../debian/src/gfdllicenseexample.html | 13 -------------
.../debian/src/gfdllicenseexample.texi | 13 -------------
.../debian/src/gfdllicenseexamplesbr.html | 13 -------------
.../debian/src/gfdltexcomments.tex | 7 -------
.../debian/src/gnashfalsepositive.html | 20 --------------------
.../debian/src/gnashfalsepositive.info | 14 --------------
.../debian/src/gnashfalsepositive.xml | 15 ---------------
.../debian/src/gnashfalsepositive2.html | 15 ---------------
.../debian/src/make-stds.texi | 7 -------
t/tests/cruft-gfdl-invariants/debian/src/normal.c | 13 -------------
.../cruft-gfdl-invariants/debian/src/normal.texi | 6 ------
.../debian/src/normalbkchem.texi | 6 ------
.../debian/src/normalmancomment.txt | 6 ------
.../debian/src/normalwithbreakathyphen.texi | 8 --------
.../debian/src/notaproblem/diveintopythonok.html | 12 ++++++++++++
.../debian/src/notaproblem/findutilsok.c | 15 +++++++++++++++
.../debian/src/notaproblem/gfdllicenseexample.html | 13 +++++++++++++
.../debian/src/notaproblem/gfdllicenseexample.texi | 13 +++++++++++++
.../src/notaproblem/gfdllicenseexamplesbr.html | 13 +++++++++++++
.../debian/src/notaproblem/gfdltexcomments.tex | 7 +++++++
.../debian/src/notaproblem/gnashfalsepositive.html | 20 ++++++++++++++++++++
.../debian/src/notaproblem/gnashfalsepositive.info | 14 ++++++++++++++
.../debian/src/notaproblem/gnashfalsepositive.xml | 15 +++++++++++++++
.../src/notaproblem/gnashfalsepositive2.html | 15 +++++++++++++++
.../debian/src/notaproblem/make-stds.texi | 7 +++++++
.../debian/src/notaproblem/normal.c | 13 +++++++++++++
.../debian/src/notaproblem/normal.texi | 6 ++++++
.../debian/src/notaproblem/normalbkchem.texi | 6 ++++++
.../debian/src/notaproblem/normalmancomment.txt | 6 ++++++
.../src/notaproblem/normalwithbreakathyphen.texi | 8 ++++++++
.../debian/src/notaproblem/partedvariant.txt | 8 ++++++++
.../debian/src/notaproblem/patch-R.diff | 7 +++++++
.../debian/src/notaproblem/patch-c0.diff | 18 ++++++++++++++++++
.../debian/src/notaproblem/patch-u.diff | 9 +++++++++
.../debian/src/notaproblem/patch-uR.diff | 9 +++++++++
.../debian/src/notaproblem/patch.diff | 7 +++++++
.../debian/src/notaproblem/variantdictfold.txt | 7 +++++++
.../debian/src/notaproblem/zeroisnotplural.texi | 6 ++++++
.../debian/src/partedvariant.txt | 8 --------
.../cruft-gfdl-invariants/debian/src/patch-R.diff | 7 -------
.../cruft-gfdl-invariants/debian/src/patch-c0.diff | 18 ------------------
.../cruft-gfdl-invariants/debian/src/patch-u.diff | 9 ---------
.../cruft-gfdl-invariants/debian/src/patch-uR.diff | 9 ---------
.../cruft-gfdl-invariants/debian/src/patch.diff | 7 -------
.../debian/src/variantdictfold.txt | 7 -------
.../debian/src/zeroisnotplural.texi | 6 ------
48 files changed, 254 insertions(+), 254 deletions(-)
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/diveintopythonok.html
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/findutilsok.c
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexample.html
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexample.texi
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexamplesbr.html
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gfdltexcomments.tex
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.html
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.info
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.xml
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive2.html
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/make-stds.texi
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/normal.c
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/normal.texi
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/normalbkchem.texi
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/normalmancomment.txt
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/normalwithbreakathyphen.texi
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/diveintopythonok.html
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/findutilsok.c
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexample.html
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexample.texi
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexamplesbr.html
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdltexcomments.tex
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.html
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.info
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.xml
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive2.html
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/make-stds.texi
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normal.c
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normal.texi
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalbkchem.texi
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalmancomment.txt
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalwithbreakathyphen.texi
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/partedvariant.txt
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-R.diff
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-c0.diff
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-u.diff
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-uR.diff
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch.diff
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/variantdictfold.txt
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/zeroisnotplural.texi
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/partedvariant.txt
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/patch-R.diff
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/patch-c0.diff
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/patch-u.diff
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/patch-uR.diff
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/patch.diff
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/variantdictfold.txt
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/zeroisnotplural.texi
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/diveintopythonok.html b/t/tests/cruft-gfdl-invariants/debian/src/diveintopythonok.html
deleted file mode 100644
index f5c0999..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/diveintopythonok.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<!--- This is a old false positive -->
-<body>
- <div class="legalnotice">
- <p>Permission is granted to copy, distribute, and/or modify this document under the terms of the <span class="acronym">GNU</span> Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant
- Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in <a href="../appendix/fdl.html" title="Appendix G. GNU Free Documentation License">Appendix G, <i>GNU Free Documentation License</i></a>.
- </p>
- <p>The example programs in this book are free software; you can redistribute and/or modify them under the terms of the <span class="application">Python</span> license as published by the <span class="application">Python</span> Software Foundation. A copy of the license is included in <a href="../appendix/license.html" title="Appendix H. Python license">Appendix H, <i>Python license</i></a>.
- </p>
- </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/findutilsok.c b/t/tests/cruft-gfdl-invariants/debian/src/findutilsok.c
deleted file mode 100644
index 23aa0af..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/findutilsok.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* false positive from findutils */
- static const char *copy_para[]=
- {
- "Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006,"
- ,"2007, 2009, 2010, 2011 Free Software Foundation, Inc."
- ,""
- ,"Permission is granted to copy, distribute and/or modify this document"
- ,"under the terms of the GNU Free Documentation License, Version 1.3 or"
- ,"any later version published by the Free Software Foundation; with no"
- ,"Invariant Sections, with no Front-Cover Texts, and with no Back-Cover"
- ,"Texts. A copy of the license is included in the ``GNU Free"
- ,"Documentation License'' file as part of this distribution."
- ""
- ,NULL
- };
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexample.html b/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexample.html
deleted file mode 100644
index fffca61..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexample.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-false positive found in license text:
-<pre>
-Copyright (C) year your name.
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3
-or any later version published by the Free Software Foundation;
-with the Invariant Sections being <var>list their titles</var>, with
-the Front-Cover Texts being <var>list</var>, and with the Back-Cover Texts
-being <var>list</var>.
-A copy of the license is included in the section entitled ``GNU Free Documentation License''.
-</html>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexample.texi b/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexample.texi
deleted file mode 100644
index fc52ba9..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexample.texi
+++ /dev/null
@@ -1,13 +0,0 @@
-false positive found in license text:
-@smallexample
-@group
- Copyright (C) @var{year} @var{your name}.
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.3
- or any later version published by the Free Software Foundation;
- with the Invariant Sections being @var{list their titles}, with the
- Front-Cover Texts being @var{list}, and with the Back-Cover Texts being @var{list}.
- A copy of the license is included in the section entitled ``GNU
- Free Documentation License''.
-@end group
-@end smallexample
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexamplesbr.html b/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexamplesbr.html
deleted file mode 100644
index 46cbd2f..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexamplesbr.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-false positive found in license text:
-<pre>
-Copyright (C) year your name.
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3
-or any later version published by the Free Software Foundation;
-with the<br/> Invariant Sections<br /> being <var>list their titles</var>, with
-the Front-Cover Texts being <var>list</var>, and with the Back-Cover Texts
-being <var>list</var>.
-A copy of the license is included in the section entitled ``GNU Free Documentation License''.
-</html>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gfdltexcomments.tex b/t/tests/cruft-gfdl-invariants/debian/src/gfdltexcomments.tex
deleted file mode 100644
index 00e496c..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/gfdltexcomments.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-% Permission is granted to copy, distribute and/or modify this document
-% under the terms of the GNU Free Documentation License, Version 1.1 or
-% any later version published by the Free Software Foundation; with no
-% Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-% Texts. A copy of the license is included in the section entitled
-% ``GNU Free Documentation License.''
-%
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.html b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.html
deleted file mode 100644
index 297e493..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<body>
-
-<div>
-<p class="copyright">Copyright 2005, 2006, 2007, 2008 Free Software Foundation</p>
-</div>
-<div>
-<div class="legalnotice"><a name="legalnotice"></a>
-<p>
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the <a class="link" href="#fdl" title="Appendix<A0>A.<A0>GNU Free Documentation License"><em class="citetitle">GNU
- Free Documentation License</em></a>, Version 1.1 or any later
- version published by the Free Software Foundation with no Invariant
- Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find
- a copy of the GFDL at this <a class="link" href="#fdl" title="Appendix<A0>A.<A0>GNU Free Documentation License">link</a> or in the file COPYING-DOCS
- distributed with this manual.
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.info b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.info
deleted file mode 100644
index cc7a754..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.info
+++ /dev/null
@@ -1,14 +0,0 @@
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and license
-notices just after the title page:
-
-Copyright 2008, Free Software Foundation.
-
-Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-version 1.1 or any later version published by the Free Software
-Foundation; with noInvariant Sections (*note fdl-invariant::),
-with no Front-Cover Texts (*note fdl-cover-texts::), and with no
-Back-Cover Texts (*note fdl-cover-texts::). A copy of the license
-is included in the section entitled "GNU Free Documentation
-License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.xml b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.xml
deleted file mode 100644
index d4b5f97..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<body>
-<div class="blockquote"><blockquote class="blockquote"><p>
- Copyright 2008, Free Software Foundation.
- </p><p>
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the GNU Free Documentation
- License, Version 1.1 or any later version published by the
- Free Software Foundation; with no<link class="link" href="#fdl-invariant">Invariant Sections</link>, with no <link class="link" href="#fdl-cover-texts">Front-Cover Texts</link>,
- and with no <a class="link" href="#fdl-cover-texts">Back-Cover
- Texts</a>. A copy of the license is included in
- the section entitled "GNU Free Documentation License".
-</p></blockquote></div>
-</body>
-</html>
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive2.html b/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive2.html
deleted file mode 100644
index cac9aba..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/gnashfalsepositive2.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<body>
-<div class="blockquote"><blockquote class="blockquote"><p>
- Copyright 2008, Free Software Foundation.
- </p><p>
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the GNU Free Documentation
- License, Version 1.1 or any later version published by the
- Free Software Foundation; with no<a class="link" href="#fdl-invariant">Invariant Sections</a>, with no <a class="link" href="#fdl-cover-texts">Front-Cover Texts</a>,
- and with no <a class="link" href="#fdl-cover-texts">Back-Cover
- Texts</a>. A copy of the license is included in
- the section entitled "GNU Free Documentation License".
-</p></blockquote></div>
-</body>
-</html>
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/make-stds.texi b/t/tests/cruft-gfdl-invariants/debian/src/make-stds.texi
deleted file mode 100644
index b5c2685..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/make-stds.texi
+++ /dev/null
@@ -1,7 +0,0 @@
-@c Permission is granted to copy, distribute and/or modify this document
-@c under the terms of the GNU Free Documentation License, Version 1.1
-@c or any later version published by the Free Software Foundation;
-@c with no Invariant Sections, with no
-@c Front-Cover Texts, and with no Back-Cover Texts.
-@c A copy of the license is included in the section entitled ``GNU
-@c Free Documentation License''.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/normal.c b/t/tests/cruft-gfdl-invariants/debian/src/normal.c
deleted file mode 100644
index a58e927..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/normal.c
+++ /dev/null
@@ -1,13 +0,0 @@
- /*****************************************************************************/
-/** \mainpage Cal3D API Reference
- * <center>
- * <p>
- * Permission is granted to copy, distribute and/or modify this document
- * under the terms of the GNU Free Documentation License, Version 1.1 or
- * any later version published by the Free Software Foundation;
- * with no Invariant Sections, no Front-Cover Texts and
- * no Back-Cover Texts;
- * A copy of the license is included in the section entitled
- * \link license "GNU Free Documentation License" \endlink .
- * </center>
- *****************************************************************************/
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/normal.texi b/t/tests/cruft-gfdl-invariants/debian/src/normal.texi
deleted file mode 100644
index d9c1b54..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/normal.texi
+++ /dev/null
@@ -1,6 +0,0 @@
-Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-version 1.3 or any later version published by the Free Software
-Foundation; with no Invariant Sections, no Front-Cover Texts and
-no Back-Cover Texts. A copy of the license is included in the
-section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/normalbkchem.texi b/t/tests/cruft-gfdl-invariants/debian/src/normalbkchem.texi
deleted file mode 100644
index dd888e2..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/normalbkchem.texi
+++ /dev/null
@@ -1,6 +0,0 @@
-Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-version 1.3 or any later version published by the Free Software
-Foundation; no Invariant Sections, no Front-Cover Texts,
-no Back-Cover Texts. A copy of the license is included in the
-section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/normalmancomment.txt b/t/tests/cruft-gfdl-invariants/debian/src/normalmancomment.txt
deleted file mode 100644
index 8d0f3a4..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/normalmancomment.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-.\" manual page for blaze, a command wrapper for BlazeBlogger
-.\"
-.\" Permission is granted to copy, distribute and/or modify this document
-.\" under the terms of the GNU Free Documentation License, Version 1.3 or
-.\" any later version published by the Free Software Foundation; with no
-.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/normalwithbreakathyphen.texi b/t/tests/cruft-gfdl-invariants/debian/src/normalwithbreakathyphen.texi
deleted file mode 100644
index 22ae575..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/normalwithbreakathyphen.texi
+++ /dev/null
@@ -1,8 +0,0 @@
-Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-version 1.3 or any later version published by the Free Software
-Foundation; with no Invariant Sections, no Front-
-Cover Texts and
-no Back-
-Cover Texts. A copy of the license is included in the
-section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/diveintopythonok.html b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/diveintopythonok.html
new file mode 100644
index 0000000..f5c0999
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/diveintopythonok.html
@@ -0,0 +1,12 @@
+<html>
+<!--- This is a old false positive -->
+<body>
+ <div class="legalnotice">
+ <p>Permission is granted to copy, distribute, and/or modify this document under the terms of the <span class="acronym">GNU</span> Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant
+ Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in <a href="../appendix/fdl.html" title="Appendix G. GNU Free Documentation License">Appendix G, <i>GNU Free Documentation License</i></a>.
+ </p>
+ <p>The example programs in this book are free software; you can redistribute and/or modify them under the terms of the <span class="application">Python</span> license as published by the <span class="application">Python</span> Software Foundation. A copy of the license is included in <a href="../appendix/license.html" title="Appendix H. Python license">Appendix H, <i>Python license</i></a>.
+ </p>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/findutilsok.c b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/findutilsok.c
new file mode 100644
index 0000000..23aa0af
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/findutilsok.c
@@ -0,0 +1,15 @@
+/* false positive from findutils */
+ static const char *copy_para[]=
+ {
+ "Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006,"
+ ,"2007, 2009, 2010, 2011 Free Software Foundation, Inc."
+ ,""
+ ,"Permission is granted to copy, distribute and/or modify this document"
+ ,"under the terms of the GNU Free Documentation License, Version 1.3 or"
+ ,"any later version published by the Free Software Foundation; with no"
+ ,"Invariant Sections, with no Front-Cover Texts, and with no Back-Cover"
+ ,"Texts. A copy of the license is included in the ``GNU Free"
+ ,"Documentation License'' file as part of this distribution."
+ ""
+ ,NULL
+ };
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexample.html b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexample.html
new file mode 100644
index 0000000..fffca61
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexample.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+false positive found in license text:
+<pre>
+Copyright (C) year your name.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3
+or any later version published by the Free Software Foundation;
+with the Invariant Sections being <var>list their titles</var>, with
+the Front-Cover Texts being <var>list</var>, and with the Back-Cover Texts
+being <var>list</var>.
+A copy of the license is included in the section entitled ``GNU Free Documentation License''.
+</html>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexample.texi b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexample.texi
new file mode 100644
index 0000000..fc52ba9
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexample.texi
@@ -0,0 +1,13 @@
+false positive found in license text:
+@smallexample
+@group
+ Copyright (C) @var{year} @var{your name}.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with the Invariant Sections being @var{list their titles}, with the
+ Front-Cover Texts being @var{list}, and with the Back-Cover Texts being @var{list}.
+ A copy of the license is included in the section entitled ``GNU
+ Free Documentation License''.
+@end group
+@end smallexample
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexamplesbr.html b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexamplesbr.html
new file mode 100644
index 0000000..46cbd2f
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdllicenseexamplesbr.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+false positive found in license text:
+<pre>
+Copyright (C) year your name.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3
+or any later version published by the Free Software Foundation;
+with the<br/> Invariant Sections<br /> being <var>list their titles</var>, with
+the Front-Cover Texts being <var>list</var>, and with the Back-Cover Texts
+being <var>list</var>.
+A copy of the license is included in the section entitled ``GNU Free Documentation License''.
+</html>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdltexcomments.tex b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdltexcomments.tex
new file mode 100644
index 0000000..00e496c
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gfdltexcomments.tex
@@ -0,0 +1,7 @@
+% Permission is granted to copy, distribute and/or modify this document
+% under the terms of the GNU Free Documentation License, Version 1.1 or
+% any later version published by the Free Software Foundation; with no
+% Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+% Texts. A copy of the license is included in the section entitled
+% ``GNU Free Documentation License.''
+%
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.html b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.html
new file mode 100644
index 0000000..297e493
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.html
@@ -0,0 +1,20 @@
+<html>
+<body>
+
+<div>
+<p class="copyright">Copyright 2005, 2006, 2007, 2008 Free Software Foundation</p>
+</div>
+<div>
+<div class="legalnotice"><a name="legalnotice"></a>
+<p>
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the <a class="link" href="#fdl" title="Appendix<A0>A.<A0>GNU Free Documentation License"><em class="citetitle">GNU
+ Free Documentation License</em></a>, Version 1.1 or any later
+ version published by the Free Software Foundation with no Invariant
+ Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find
+ a copy of the GFDL at this <a class="link" href="#fdl" title="Appendix<A0>A.<A0>GNU Free Documentation License">link</a> or in the file COPYING-DOCS
+ distributed with this manual.
+</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.info b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.info
new file mode 100644
index 0000000..cc7a754
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.info
@@ -0,0 +1,14 @@
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+Copyright 2008, Free Software Foundation.
+
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+version 1.1 or any later version published by the Free Software
+Foundation; with noInvariant Sections (*note fdl-invariant::),
+with no Front-Cover Texts (*note fdl-cover-texts::), and with no
+Back-Cover Texts (*note fdl-cover-texts::). A copy of the license
+is included in the section entitled "GNU Free Documentation
+License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.xml b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.xml
new file mode 100644
index 0000000..d4b5f97
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.xml
@@ -0,0 +1,15 @@
+<html>
+<body>
+<div class="blockquote"><blockquote class="blockquote"><p>
+ Copyright 2008, Free Software Foundation.
+ </p><p>
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation
+ License, Version 1.1 or any later version published by the
+ Free Software Foundation; with no<link class="link" href="#fdl-invariant">Invariant Sections</link>, with no <link class="link" href="#fdl-cover-texts">Front-Cover Texts</link>,
+ and with no <a class="link" href="#fdl-cover-texts">Back-Cover
+ Texts</a>. A copy of the license is included in
+ the section entitled "GNU Free Documentation License".
+</p></blockquote></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive2.html b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive2.html
new file mode 100644
index 0000000..cac9aba
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive2.html
@@ -0,0 +1,15 @@
+<html>
+<body>
+<div class="blockquote"><blockquote class="blockquote"><p>
+ Copyright 2008, Free Software Foundation.
+ </p><p>
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation
+ License, Version 1.1 or any later version published by the
+ Free Software Foundation; with no<a class="link" href="#fdl-invariant">Invariant Sections</a>, with no <a class="link" href="#fdl-cover-texts">Front-Cover Texts</a>,
+ and with no <a class="link" href="#fdl-cover-texts">Back-Cover
+ Texts</a>. A copy of the license is included in
+ the section entitled "GNU Free Documentation License".
+</p></blockquote></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/make-stds.texi b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/make-stds.texi
new file mode 100644
index 0000000..b5c2685
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/make-stds.texi
@@ -0,0 +1,7 @@
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.1
+@c or any later version published by the Free Software Foundation;
+@c with no Invariant Sections, with no
+@c Front-Cover Texts, and with no Back-Cover Texts.
+@c A copy of the license is included in the section entitled ``GNU
+@c Free Documentation License''.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normal.c b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normal.c
new file mode 100644
index 0000000..a58e927
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normal.c
@@ -0,0 +1,13 @@
+ /*****************************************************************************/
+/** \mainpage Cal3D API Reference
+ * <center>
+ * <p>
+ * Permission is granted to copy, distribute and/or modify this document
+ * under the terms of the GNU Free Documentation License, Version 1.1 or
+ * any later version published by the Free Software Foundation;
+ * with no Invariant Sections, no Front-Cover Texts and
+ * no Back-Cover Texts;
+ * A copy of the license is included in the section entitled
+ * \link license "GNU Free Documentation License" \endlink .
+ * </center>
+ *****************************************************************************/
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normal.texi b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normal.texi
new file mode 100644
index 0000000..d9c1b54
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normal.texi
@@ -0,0 +1,6 @@
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+version 1.3 or any later version published by the Free Software
+Foundation; with no Invariant Sections, no Front-Cover Texts and
+no Back-Cover Texts. A copy of the license is included in the
+section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalbkchem.texi b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalbkchem.texi
new file mode 100644
index 0000000..dd888e2
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalbkchem.texi
@@ -0,0 +1,6 @@
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+version 1.3 or any later version published by the Free Software
+Foundation; no Invariant Sections, no Front-Cover Texts,
+no Back-Cover Texts. A copy of the license is included in the
+section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalmancomment.txt b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalmancomment.txt
new file mode 100644
index 0000000..8d0f3a4
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalmancomment.txt
@@ -0,0 +1,6 @@
+.\" manual page for blaze, a command wrapper for BlazeBlogger
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalwithbreakathyphen.texi b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalwithbreakathyphen.texi
new file mode 100644
index 0000000..22ae575
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalwithbreakathyphen.texi
@@ -0,0 +1,8 @@
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+version 1.3 or any later version published by the Free Software
+Foundation; with no Invariant Sections, no Front-
+Cover Texts and
+no Back-
+Cover Texts. A copy of the license is included in the
+section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/partedvariant.txt b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/partedvariant.txt
new file mode 100644
index 0000000..96037ac
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/partedvariant.txt
@@ -0,0 +1,8 @@
+Parted 2.13 version with strange grammar.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3
+or any later version published by the Free Software Foundation;
+with the no Invariant Sections, with the no Front-Cover Texts, and
+with no Back-Cover Texts. A copy of the license is included in the
+file, COPYING.DOC.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-R.diff b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-R.diff
new file mode 100644
index 0000000..73e379b
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-R.diff
@@ -0,0 +1,7 @@
+1,6d0
+< Permission is granted to copy, distribute and/or modify this
+< document under the terms of the GNU Free Documentation License,
+< version 1.3 or any later version published by the Free Software
+< Foundation; with no Invariant Sections, no Front-Cover Texts and
+< no Back-Cover Texts. A copy of the license is included in the
+< section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-c0.diff b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-c0.diff
new file mode 100644
index 0000000..600653e
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-c0.diff
@@ -0,0 +1,18 @@
+*** make-stds.texi 2013-02-17 21:44:05.485250349 +0100
+--- normal.texi 2012-12-20 21:23:22.829397718 +0100
+***************
+*** 1,7 ****
+! @c Permission is granted to copy, distribute and/or modify this document
+! @c under the terms of the GNU Free Documentation License, Version 1.1
+! @c or any later version published by the Free Software Foundation;
+! @c with no Invariant Sections, with no
+! @c Front-Cover Texts, and with no Back-Cover Texts.
+! @c A copy of the license is included in the section entitled ``GNU
+! @c Free Documentation License''.
+--- 1,6 ----
+! Permission is granted to copy, distribute and/or modify this
+! document under the terms of the GNU Free Documentation License,
+! version 1.3 or any later version published by the Free Software
+! Foundation; with no Invariant Sections, no Front-Cover Texts and
+! no Back-Cover Texts. A copy of the license is included in the
+! section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-u.diff b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-u.diff
new file mode 100644
index 0000000..db6e4f9
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-u.diff
@@ -0,0 +1,9 @@
+--- /dev/null 2013-05-15 23:18:30.206386135 +0200
++++ normal.texi 2012-12-20 21:23:22.829397718 +0100
+@@ -0,0 +1,6 @@
++Permission is granted to copy, distribute and/or modify this
++document under the terms of the GNU Free Documentation License,
++version 1.3 or any later version published by the Free Software
++Foundation; with no Invariant Sections, no Front-Cover Texts and
++no Back-Cover Texts. A copy of the license is included in the
++section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-uR.diff b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-uR.diff
new file mode 100644
index 0000000..347adff
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch-uR.diff
@@ -0,0 +1,9 @@
+--- normal.texi 2012-12-20 21:23:22.829397718 +0100
++++ /dev/null 2013-05-15 23:18:30.206386135 +0200
+@@ -1,6 +0,0 @@
+-Permission is granted to copy, distribute and/or modify this
+-document under the terms of the GNU Free Documentation License,
+-version 1.3 or any later version published by the Free Software
+-Foundation; with no Invariant Sections, no Front-Cover Texts and
+-no Back-Cover Texts. A copy of the license is included in the
+-section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch.diff b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch.diff
new file mode 100644
index 0000000..f64bfaf
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/patch.diff
@@ -0,0 +1,7 @@
+0a1,6
+> Permission is granted to copy, distribute and/or modify this
+> document under the terms of the GNU Free Documentation License,
+> version 1.3 or any later version published by the Free Software
+> Foundation; with no Invariant Sections, no Front-Cover Texts and
+> no Back-Cover Texts. A copy of the license is included in the
+> section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/variantdictfold.txt b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/variantdictfold.txt
new file mode 100644
index 0000000..f9d9615
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/variantdictfold.txt
@@ -0,0 +1,7 @@
+This is ok
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation
+ License, Version 1.1 or any later version published by the
+ Free Software Foundation; with no Invariant Sections, Front-
+ or Back-Cover Texts. A copy of the license is included in the
+ section entitled "{GNU Free Documentation License}".
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/zeroisnotplural.texi b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/zeroisnotplural.texi
new file mode 100644
index 0000000..8782eed
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/zeroisnotplural.texi
@@ -0,0 +1,6 @@
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+version 1.3 or any later version published by the Free Software
+Foundation; with no Invariant Section, no Front-Cover Text and
+no Back-Cover Text. A copy of the license is included in the
+section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/partedvariant.txt b/t/tests/cruft-gfdl-invariants/debian/src/partedvariant.txt
deleted file mode 100644
index 96037ac..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/partedvariant.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Parted 2.13 version with strange grammar.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3
-or any later version published by the Free Software Foundation;
-with the no Invariant Sections, with the no Front-Cover Texts, and
-with no Back-Cover Texts. A copy of the license is included in the
-file, COPYING.DOC.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/patch-R.diff b/t/tests/cruft-gfdl-invariants/debian/src/patch-R.diff
deleted file mode 100644
index 73e379b..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/patch-R.diff
+++ /dev/null
@@ -1,7 +0,0 @@
-1,6d0
-< Permission is granted to copy, distribute and/or modify this
-< document under the terms of the GNU Free Documentation License,
-< version 1.3 or any later version published by the Free Software
-< Foundation; with no Invariant Sections, no Front-Cover Texts and
-< no Back-Cover Texts. A copy of the license is included in the
-< section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/patch-c0.diff b/t/tests/cruft-gfdl-invariants/debian/src/patch-c0.diff
deleted file mode 100644
index 600653e..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/patch-c0.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-*** make-stds.texi 2013-02-17 21:44:05.485250349 +0100
---- normal.texi 2012-12-20 21:23:22.829397718 +0100
-***************
-*** 1,7 ****
-! @c Permission is granted to copy, distribute and/or modify this document
-! @c under the terms of the GNU Free Documentation License, Version 1.1
-! @c or any later version published by the Free Software Foundation;
-! @c with no Invariant Sections, with no
-! @c Front-Cover Texts, and with no Back-Cover Texts.
-! @c A copy of the license is included in the section entitled ``GNU
-! @c Free Documentation License''.
---- 1,6 ----
-! Permission is granted to copy, distribute and/or modify this
-! document under the terms of the GNU Free Documentation License,
-! version 1.3 or any later version published by the Free Software
-! Foundation; with no Invariant Sections, no Front-Cover Texts and
-! no Back-Cover Texts. A copy of the license is included in the
-! section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/patch-u.diff b/t/tests/cruft-gfdl-invariants/debian/src/patch-u.diff
deleted file mode 100644
index db6e4f9..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/patch-u.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null 2013-05-15 23:18:30.206386135 +0200
-+++ normal.texi 2012-12-20 21:23:22.829397718 +0100
-@@ -0,0 +1,6 @@
-+Permission is granted to copy, distribute and/or modify this
-+document under the terms of the GNU Free Documentation License,
-+version 1.3 or any later version published by the Free Software
-+Foundation; with no Invariant Sections, no Front-Cover Texts and
-+no Back-Cover Texts. A copy of the license is included in the
-+section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/patch-uR.diff b/t/tests/cruft-gfdl-invariants/debian/src/patch-uR.diff
deleted file mode 100644
index 347adff..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/patch-uR.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- normal.texi 2012-12-20 21:23:22.829397718 +0100
-+++ /dev/null 2013-05-15 23:18:30.206386135 +0200
-@@ -1,6 +0,0 @@
--Permission is granted to copy, distribute and/or modify this
--document under the terms of the GNU Free Documentation License,
--version 1.3 or any later version published by the Free Software
--Foundation; with no Invariant Sections, no Front-Cover Texts and
--no Back-Cover Texts. A copy of the license is included in the
--section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/patch.diff b/t/tests/cruft-gfdl-invariants/debian/src/patch.diff
deleted file mode 100644
index f64bfaf..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/patch.diff
+++ /dev/null
@@ -1,7 +0,0 @@
-0a1,6
-> Permission is granted to copy, distribute and/or modify this
-> document under the terms of the GNU Free Documentation License,
-> version 1.3 or any later version published by the Free Software
-> Foundation; with no Invariant Sections, no Front-Cover Texts and
-> no Back-Cover Texts. A copy of the license is included in the
-> section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/variantdictfold.txt b/t/tests/cruft-gfdl-invariants/debian/src/variantdictfold.txt
deleted file mode 100644
index f9d9615..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/variantdictfold.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-This is ok
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the GNU Free Documentation
- License, Version 1.1 or any later version published by the
- Free Software Foundation; with no Invariant Sections, Front-
- or Back-Cover Texts. A copy of the license is included in the
- section entitled "{GNU Free Documentation License}".
\ No newline at end of file
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/zeroisnotplural.texi b/t/tests/cruft-gfdl-invariants/debian/src/zeroisnotplural.texi
deleted file mode 100644
index 8782eed..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/zeroisnotplural.texi
+++ /dev/null
@@ -1,6 +0,0 @@
-Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-version 1.3 or any later version published by the Free Software
-Foundation; with no Invariant Section, no Front-Cover Text and
-no Back-Cover Text. A copy of the license is included in the
-section entitled "GNU Free Documentation License".
--
1.7.10.4
From 6ce0341361692501fcbec8a7b4028669f10b1dd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sun, 19 May 2013 16:43:25 +0200
Subject: [PATCH 17/19] Fix the false positive when html is embeded is c
language
In this case we could find quote instead of space. Fix this false positive.
---
checks/cruft | 10 +++++-----
.../debian/src/notaproblem/gnashfalsepositive.xml.c | 17 +++++++++++++++++
2 files changed, 22 insertions(+), 5 deletions(-)
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.xml.c
diff --git a/checks/cruft b/checks/cruft
index b33254c..00e74c3 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -486,7 +486,7 @@ sub find_cruft {
# local space
my $s = '(?:\s|\@c|%|\n\+|\n-|\n!|\n<|\n>|<br\s?/>|\n\.\\\"|\*|\"|,\")';
# html or info file with link
- my $sl = '(?:\s*|\s*<a\s.*?>\s*|\s*</a>\s*|\s*<link.*?>\s*|\s*</link>\s*|\s*\(\*note\s.*?::\)\s*)';
+ my $sl = "$s*(?:<a$s.*?>$s*|</a>$s*|<link.*?>$s*|</link>$s*|$s*\\(\\*note$s.*?::\\))?";
# GFDL license, assume it is bad unless it
# explicitly states it has no "bad sections".
given($+{gfdlsections}) {
@@ -507,17 +507,17 @@ sub find_cruft {
}
when(m/with $s+ the $s+ Invariant $s+ Sections $s+ being
$s+ (?:\@var\{|<var>)? LIST $s+ THEIR $s+TITLES (?:\}|<\/var>)? $s* ,?
- $s+ with $s+ the $s+ Front-Cover $s+ Texts $s+ being
+ $s+ with $s+ the $s+ Front-$s*Cover $s+ Texts $s+ being
$s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)? $s* ,?
- $s+ and $s+ with $s+ the $s+ Back-Cover $s+ Texts $s+ being
+ $s+ and $s+ with $s+ the $s+ Back-$s*Cover $s+ Texts $s+ being
$s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)?/xiso) {
# verbatim text of license is ok
}
when(m/with $s+ the $sl Invariant $s+ Sections $sl being
$s+ (?:\@var\{|<var>)? LIST $s+ THEIR $s+TITLES (?:\}|<\/var>)? $s* ,?
- $s+ with $s+ the $sl Front-Cover $s+ Texts $sl being
+ $s+ with $s+ the ($sl) Front-$s*Cover $s+ Texts $sl being
$s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)? $s* ,?
- $s+ and $s+ with $s+ the $sl Back-Cover $s+ Texts $sl being
+ $s+ and $s+ with $s+ the $sl Back-$s*Cover $s+ Texts $sl being
$s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)?/xiso) {
# verbatim text with link of license is ok
}
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.xml.c b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.xml.c
new file mode 100644
index 0000000..0c9afda
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/gnashfalsepositive.xml.c
@@ -0,0 +1,17 @@
+static char test[] =
+"<html>"
+"<body>"
+"<div class=\"blockquote\"><blockquote class=\"blockquote\"><p>"
+" Copyright 2008, Free Software Foundation."
+" </p><p>"
+" Permission is granted to copy, distribute and/or modify this"
+" document under the terms of the GNU Free Documentation"
+" License, Version 1.1 or any later version published by the"
+" Free Software Foundation; with no"
+" <link class=\"link\" href=\"#fdl-invariant\">Invariant Sections</link>, with no <link class=\"link\" href=\"#fdl-cover-texts\">Front-Cover Texts</link>",
+" and with no <a class=\"link\" href=\"#fdl-cover-texts\">Back-Cover",
+" Texts</a>. A copy of the license is included in",
+" the section entitled \"GNU Free Documentation License\"."
+"</p></blockquote></div>"
+"</body>"
+"</html>";
\ No newline at end of file
--
1.7.10.4
From fadcc1c0d389ce6a7f4d9e13383be65eeadf67dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sun, 19 May 2013 17:18:55 +0200
Subject: [PATCH 19/19] Allow pipe as space
---
checks/cruft | 2 +-
.../debian/src/notaproblem/normalwithpipe.txt | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalwithpipe.txt
diff --git a/checks/cruft b/checks/cruft
index eec57c4..a7a41cd 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -484,7 +484,7 @@ sub find_cruft {
(?:A \s+ copy \s+ of \s+ the \s+ license \s+ is \s+ included|You \s+ can \s+ find \s+ a \s+ copy \s+ of \s+ the \s+ GFDL)/xis) {
if (!exists $licenseproblemhash{'gfdl-invariants'}) {
# local space
- my $s = '(?:\s|\@c|%|\n\+|\n-|\n!|\n<|\n>|<br\s?/>|\n\.\\\"|\*|\"|,\"|\\\\n)';
+ my $s = '(?:\s|\@c|%|\n\+|\n-|\n!|\n<|\n>|<br\s?/>|\n\.\\\"|\*|\"|,\"|\\\\n|\|)';
# html or info file with link
my $sl = "$s*(?:<a$s.*?>$s*|</a>$s*|<link.*?>$s*|</link>$s*|$s*\\(\\*note$s.*?::\\))?";
# GFDL license, assume it is bad unless it
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalwithpipe.txt b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalwithpipe.txt
new file mode 100644
index 0000000..8a0594a
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/normalwithpipe.txt
@@ -0,0 +1,7 @@
+Some user ident with pipe (|)
+ | Permission is granted to copy, distribute and/or modify this
+ | document under the terms of the GNU Free Documentation License,
+ | version 1.3 or any later version published by the Free Software
+ | Foundation; with no Invariant Sections, no Front-Cover Texts and
+ | no Back-Cover Texts. A copy of the license is included in the
+ | section entitled "GNU Free Documentation License".
--
1.7.10.4
From 27caec388d27a23c04b2ba63b0953f4efe30401c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sun, 19 May 2013 12:46:32 +0200
Subject: [PATCH 13/19] Fix false positive for detection of gfdl license
problem
If text is embeded in C string we have false positive.
Fix it.
---
checks/cruft | 2 +-
t/tests/cruft-gfdl-invariants/debian/src/findutilsok.c | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/findutilsok.c
diff --git a/checks/cruft b/checks/cruft
index 4dec077..8117a1f 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -484,7 +484,7 @@ sub find_cruft {
A \s+ copy \s+ of \s+ the \s+ license \s+ is \s+ included/xis) {
if (!exists $licenseproblemhash{'gfdl-invariants'}) {
# local space
- my $s = '(?:\s|\@c|%|\n\+|\n-|\n!|\n<|\n>|<br\s?/>|\n\.\\\"|\*)';
+ my $s = '(?:\s|\@c|%|\n\+|\n-|\n!|\n<|\n>|<br\s?/>|\n\.\\\"|\*|\"|,\")';
# GFDL license, assume it is bad unless it
# explicitly states it has no "bad sections".
given($+{gfdlsections}) {
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/findutilsok.c b/t/tests/cruft-gfdl-invariants/debian/src/findutilsok.c
new file mode 100644
index 0000000..23aa0af
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/findutilsok.c
@@ -0,0 +1,15 @@
+/* false positive from findutils */
+ static const char *copy_para[]=
+ {
+ "Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006,"
+ ,"2007, 2009, 2010, 2011 Free Software Foundation, Inc."
+ ,""
+ ,"Permission is granted to copy, distribute and/or modify this document"
+ ,"under the terms of the GNU Free Documentation License, Version 1.3 or"
+ ,"any later version published by the Free Software Foundation; with no"
+ ,"Invariant Sections, with no Front-Cover Texts, and with no Back-Cover"
+ ,"Texts. A copy of the license is included in the ``GNU Free"
+ ,"Documentation License'' file as part of this distribution."
+ ""
+ ,NULL
+ };
--
1.7.10.4
From e1f863d6060710be59a7b4917193b8166df07577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sun, 19 May 2013 17:02:45 +0200
Subject: [PATCH 18/19] Allow verbatim \n in C or other string for GFDL
detection.
Fix a false positive in gnulib.
---
checks/cruft | 4 ++--
.../debian/src/notaproblem/findutilsokoneline.c | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/notaproblem/findutilsokoneline.c
diff --git a/checks/cruft b/checks/cruft
index 00e74c3..eec57c4 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -484,7 +484,7 @@ sub find_cruft {
(?:A \s+ copy \s+ of \s+ the \s+ license \s+ is \s+ included|You \s+ can \s+ find \s+ a \s+ copy \s+ of \s+ the \s+ GFDL)/xis) {
if (!exists $licenseproblemhash{'gfdl-invariants'}) {
# local space
- my $s = '(?:\s|\@c|%|\n\+|\n-|\n!|\n<|\n>|<br\s?/>|\n\.\\\"|\*|\"|,\")';
+ my $s = '(?:\s|\@c|%|\n\+|\n-|\n!|\n<|\n>|<br\s?/>|\n\.\\\"|\*|\"|,\"|\\\\n)';
# html or info file with link
my $sl = "$s*(?:<a$s.*?>$s*|</a>$s*|<link.*?>$s*|</link>$s*|$s*\\(\\*note$s.*?::\\))?";
# GFDL license, assume it is bad unless it
@@ -531,7 +531,7 @@ sub find_cruft {
$licenseproblemhash{'gfdl-invariants'} = 1;
}
default {
- tag 'license-problem-gfdl-invariants', $name;#, $+{gfdlsections};
+ tag 'license-problem-gfdl-invariants', $name;#$+{gfdlsections};
$licenseproblemhash{'gfdl-invariants'} = 1;
}
}
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/findutilsokoneline.c b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/findutilsokoneline.c
new file mode 100644
index 0000000..c4174c3
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/notaproblem/findutilsokoneline.c
@@ -0,0 +1,10 @@
+/* false positive from findutils one line */
+ static const char *copy_para[]=
+ {
+ "Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006,"
+ ,"2007, 2009, 2010, 2011 Free Software Foundation, Inc."
+ ,""
+ ,"Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no\nInvariant Sections, with no Front-Cover Texts, and with no Back-Cover\nTexts. A copy of the license is included in the ``GNU Free Documentation License'' file as part of this distribution."
+ ""
+ ,NULL
+ };
--
1.7.10.4
Reply to: