Your message dated Mon, 18 Feb 2013 21:03:26 +0000
with message-id <[email protected]>
and subject line Bug#687664: fixed in devscripts 2.13.0
has caused the Debian Bug report #687664,
regarding [licensecheck] Does not recognize MPL 2.0
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.)
--
687664: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687664
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: devscripts
Version: 2.10.61ubuntu5.1
Severity: wishlist
Tags: patch
Running the latest Git master of licensecheck.pl against the upstream Eigen
source, I noticed it was report "UNKNOWN" for the MPL 2.0 licensed files. A
small change to the regex made it possible to recognize 2.0 as well as 1.1,
etc. I am including a patch along with tests.
-- Package-specific info:
--- /etc/devscripts.conf ---
--- ~/.devscripts ---
DEBUILD_DPKG_BUILDPACKAGE_OPTS="-i -I"
-- System Information:
Debian Release: squeeze/sid
APT prefers lucid-updates
APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500,
'lucid-backports'), (500, 'lucid'), (50, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-42-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages devscripts depends on:
ii dpkg-dev 1.16.1.2ubuntu5~ppa1~lucid1 Debian package development tools
ii libc6 2.11.1-0ubuntu7.10 Embedded GNU C Library: Shared lib
ii perl 5.10.1-8ubuntu2.1 Larry Wall's Practical Extraction
Versions of packages devscripts recommends:
ii at 3.1.11-1ubuntu5.1 Delayed job execution and batch pr
ii bsd-mailx 8.1.2-0.20090911cvs-2ubuntu1 simple mail user agent
ii bzr 2.1.4-0ubuntu1 easy to use distributed version co
ii curl 7.19.7-1ubuntu1.1 Get a file from an HTTP, HTTPS or
ii cvs 1:1.12.13-12ubuntu1.10.04.1 Concurrent Versions System
ii dctrl-too 2.14 Command-line tools to process Debi
ii dput 0.9.5.1ubuntu1 Debian package upload tool
ii fakeroot 1.14.4-1ubuntu1 Gives a fake root environment
ii firefox [ 15.0.1+build1-0ubuntu0.10.04.1 Safe and easy web browser from Moz
ii git [git- 1:1.7.11.3-0ppa1~lucid1 fast, scalable, distributed revisi
ii git-core 1:1.7.11.3-0ppa1~lucid1 fast, scalable, distributed revisi
ii gnupg 1.4.10-2ubuntu1 GNU privacy guard - a free PGP rep
ii google-ch 21.0.1180.89-r154005 The web browser from Google
ii libauthen 2.13-1 Authen::SASL - SASL Authentication
ii libparse- 2.005-2 Easy OO parsing of Debian control-
ii libterm-s 0.2-4build3 Perl extension for retrieving term
ii libtimeda 1.1900-1 Time and date functions for Perl
ii liburi-pe 1.52-1 module to manipulate and access UR
ii libwww-pe 5.834-1ubuntu0.1 Perl HTTP/WWW client/server librar
ii lintian 2.4.3ubuntu1~lucid1 Debian package checker
ii lsb-relea 4.0-0ubuntu8 Linux Standard Base version report
ii lzma 4.43-14ubuntu2 Compression method of 7z format in
ii man-db 2.5.7-2ubuntu1 on-line manual pager
ii mercurial 2.3.1-0ppa2~lucid1 easy-to-use, scalable distributed
ii openssh-c 1:5.3p1-3ubuntu7 secure shell (SSH) client, for sec
ii patch 2.6.1-3 Apply a diff file to an original
ii patchutil 0.3.1-2build1 Utilities to work with patches
ii sensible- 0.0.1ubuntu3 Utilities for sensible alternative
ii strace 4.5.19-2 A system call tracer
ii subversio 1.6.6dfsg-2ubuntu1.3 Advanced version control system
ii unzip 6.0-1build1 De-archiver for .zip files
ii w3m [www- 0.5.2-2.1ubuntu1.2 WWW browsable pager with excellent
ii wdiff 0.5-19 Compares two files word by word
ii wget 1.12-1.1ubuntu2.1 retrieves files from the web
Versions of packages devscripts suggests:
ii build-essenti 11.4build1 Informational list of build-essent
pn cvs-buildpack <none> (no description available)
ii debian-keyrin 2009.11.04 GnuPG (and obsolete PGP) keys of D
pn devscripts-el <none> (no description available)
pn equivs <none> (no description available)
ii gnuplot 4.4.3-0ubuntu2~ppa1~lucid1 A command-line driven interactive
pn libcrypt-ssle <none> (no description available)
pn libfile-deskt <none> (no description available)
ii libnet-smtp-s 1.01-2 SSL support for Net::SMTP
pn libsoap-lite- <none> (no description available)
ii libyaml-syck- 1.07-1build1 fast, lightweight YAML loader and
pn mutt <none> (no description available)
ii svn-buildpack 0.7.1 helper programs to maintain Debian
ii ubuntu-dev-to 0.99.1 useful tools for Ubuntu developers
ii w3m 0.5.2-2.1ubuntu1.2 WWW browsable pager with excellent
-- no debconf information
>From 041f90cb124128cf74dc7db90185ffd36ec1cd0f Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <[email protected]>
Date: Fri, 14 Sep 2012 15:18:37 -0500
Subject: [PATCH] Modify licensecheck to recognize the MPL v2.0.
It should recognize both as given in "Exhibit A" (no comma)
as well as used in Eigen post-relicensing (comma).
Tests have been added for MPL 1.1 (based on license text) as
well as the two variations of MPL 2.0 notices.
Signed-off-by: Ryan Pavlik <[email protected]>
---
scripts/licensecheck.pl | 4 ++--
test/licensecheck/mpl-1.1.sh | 16 ++++++++++++++++
test/licensecheck/mpl-2.0-comma.sh | 5 +++++
test/licensecheck/mpl-2.0.sh | 5 +++++
test/test_licensecheck | 6 ++++++
5 files changed, 34 insertions(+), 2 deletions(-)
create mode 100644 test/licensecheck/mpl-1.1.sh
create mode 100644 test/licensecheck/mpl-2.0-comma.sh
create mode 100644 test/licensecheck/mpl-2.0.sh
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 26740e1..c5c7808 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -478,8 +478,8 @@ sub parselicense($) {
}
}
- if ($licensetext =~ /Mozilla Public License Version ([^ ]+)/) {
- $license = "MPL (v$1) $license";
+ if ($licensetext =~ /Mozilla Public License,? (Version|v\.)
(\d+(?:\.\d+)?)/) {
+ $license = "MPL (v$2) $license";
}
if ($licensetext =~ /Released under the terms of the Artistic License ([^
]+)/) {
diff --git a/test/licensecheck/mpl-1.1.sh b/test/licensecheck/mpl-1.1.sh
new file mode 100644
index 0000000..aa75a2a
--- /dev/null
+++ b/test/licensecheck/mpl-1.1.sh
@@ -0,0 +1,16 @@
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is debian devscripts code.
+#
+# The Initial Developer of the Original Code is
+# devscripts developers.
+# Portions created by the Initial Developer are Copyright (C) 2012
+# the Initial Developer. All Rights Reserved.
diff --git a/test/licensecheck/mpl-2.0-comma.sh
b/test/licensecheck/mpl-2.0-comma.sh
new file mode 100644
index 0000000..caf2954
--- /dev/null
+++ b/test/licensecheck/mpl-2.0-comma.sh
@@ -0,0 +1,5 @@
+# Copyright devscripts developers
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/test/licensecheck/mpl-2.0.sh b/test/licensecheck/mpl-2.0.sh
new file mode 100644
index 0000000..1ce4472
--- /dev/null
+++ b/test/licensecheck/mpl-2.0.sh
@@ -0,0 +1,5 @@
+# Copyright devscripts developers
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/test/test_licensecheck b/test/test_licensecheck
index e7178df..fb67859 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -48,6 +48,12 @@ testDual() {
license "dual.c" "Public domain GPL (v3)"
}
+testMPL() {
+ license "mpl-1.1.sh" "MPL (v1.1)"
+ license "mpl-2.0.sh" "MPL (v2.0)"
+ license "mpl-2.0-comma.sh" "MPL (v2.0)"
+}
+
testMachine() {
license2 "-m" "beerware.cpp" "Beerware"
license2 "--machine" "lgpl-2.1.h" "LGPL (v2.1)"
--
1.7.11.3
--- End Message ---
--- Begin Message ---
Source: devscripts
Source-Version: 2.13.0
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: Mon, 18 Feb 2013 21:50:11 +0100
Source: devscripts
Binary: devscripts
Architecture: source amd64
Version: 2.13.0
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: 526698 650732 659231 686862 687450 687664 690024 690056 690059 694760
695609 695612 695613 695914 696018 696363 696416 697923 700584
Changes:
devscripts (2.13.0) experimental; urgency=low
.
[ Christoph Berg ]
* origtargz: New script: fetch the orig tarball of a Debian package from
various sources, and unpack it
* debcommit: --changelog-info will pass --author and --date for git commits.
.
[ James McCoy ]
* licensecheck: Recognize MPL 2.0 licenses. Thanks to Ryan Pavlik for the
patch. (Closes: #687664)
* namecheck: Check Apache's projects page for names. (Closes: #686862)
* debcommit:
+ Drop checks for old dpkg versions and always use the necessary Perl
modules (Dpkg::Changelog::Parse, Dpkg::Vendor::Ubuntu,
Dpkg::Changelog::Entry::Debian).
+ Add changelog info support for hg and bzr.
* annotate-output:
+ Handle an incomplete line of output. (Closes: #695609)
+ Don't treat backslashes in the command's output as an escape. (Closes:
#695613)
+ Don't swallow leading whitespace. (Closes: #695612, LP: #1120917)
* dscverify: Use "gpg --status-fd" to determine if a valid signature is
found and only use the signed content. (Closes: #695914)
* wrap-and-sort: Fix repeated word in man page. (Closes: #696363)
.
[ Dmitry Smirnov ]
* licensecheck:
+ Remove any regular comments pattern. (Closes: #526698)
+ Improve command line parsing.
+ Fix GPL license version detection bug.
+ Fix BSD-3-clause detection.
.
[ Paul Wise ]
* checkbashisms: When examining a bash script, indicate the lack of use of
bashisms.
* uscan:
+ Access GitHub directly instead of using githubredir.debian.net in
example GitHub watch URL.
+ Add an example watch URL that matches the various file extensions used
by common archive formats.
+ Add an example watch URL for Google Code projects.
.
[ Benjamin Drung ]
* Add bashism test cases from Raphael Geissert.
* Add autopkgtest support. (LP: #1073330)
* suspicious-source: Add inode/symlink and image/x-xpmi to whitelisted
mime-types.
* wrap-and-sort:
+ Put special entries (variables and placeholders) at the end of the list.
+ Sort debian/control*.in files too.
* licensecheck: detect (L)GPL licenses more permissively. Thanks to
Laurent Rineau for the patch. (Closes: #659231)
* Bump Standards-Version to 3.9.4 (no changes needed).
.
[ Cyril Brulebois ]
* Don't auto reverse diffs when DEBDIFF_AUTO_VER_SORT is set to yes, and
when the version in both packages is the same. (Closes: #650732)
.
[ Tony Mancill ]
* debsnap: Escape the package name when used in regex. (Closes: #696018)
.
[ David Prévot ]
* Minor manpages convention fix: do not terminate the SEE ALSO lists with a
period. (Closes: #696416)
* French translation update.
.
[ Josselin Mouette ]
* nmudiff: Use dpkg-parsechangelog to fix manual parsing bug (Closes:
#700584)
.
[ Raphael Geissert ]
* checkbashisms:
+ allow -FOO- as heredoc delimiter
+ simplify mixed single/double balanced quotes correctly
+ correct description of 'setvar'
+ detect traps for DEBUG, ERRNO, or RETURN
+ check for incorrect args. to 'exit' (Closes: #687450)
+ fix handling of # characters in quoted strings
+ detect use of $FUNCNAME, $TMOUT, and $TIMEFORMAT
+ detect uses of sleep with anything other than an int.
+ detect the use of the hash utility and $_
+ check for other forms of brace expansion
+ check for use of non-standard tilde expansion
+ check for case modification expansions
+ check for the use of $GLOBIGNORE
.
[ Regid Ichira ]
* rc-alert: Support using curl as alternative to wget. (Closes: #690024)
* wnpp-alert: Support using curl as alternative to wget. (Closes: #690056)
* wnpp-check: Support using curl as alternative to wget. (Closes: #690059)
.
[ Colin Watson ]
* debian/control: Mark devscripts Multi-Arch: foreign. (Closes: #694760)
* debchange, debcommit: Set the timestamp of temporary editor files back
one second, to make modification detection more reliable in the absence
of subsecond granularity. (Closes: #697923)
Checksums-Sha1:
1b4941cc1e9b77660daca2a13e42206375278726 2322 devscripts_2.13.0.dsc
48a8250307bf5db111e891be0fd6b9c7c6e0ca30 570736 devscripts_2.13.0.tar.xz
44e1cad02ee1e9ef78e91b2edbb127266455cd56 908894 devscripts_2.13.0_amd64.deb
Checksums-Sha256:
b6b492919af4c5414f32f8f7de91aab7f7aed222c5c55cb9333320ab08fa3406 2322
devscripts_2.13.0.dsc
bec37a7ca5b34f4cf81a3dea1bf44cbd86374057c59eeb4f779227ba181686ac 570736
devscripts_2.13.0.tar.xz
0beabffcecccbe5921422e251082a32d178d380a79fd7f22ec6cfec9104a91cf 908894
devscripts_2.13.0_amd64.deb
Files:
293ff9f7f202506719fc4208fb57071f 2322 devel optional devscripts_2.13.0.dsc
5948beeace4cda598178894458151b87 570736 devel optional devscripts_2.13.0.tar.xz
50248b283b897649b1651106da4684dd 908894 devel optional
devscripts_2.13.0_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCgAGBQJRIpSnAAoJEBWetcTvyHdMNpEP/j9vJZLWrXTiun7NpxCPHmWf
pYLqRsLAMkA4IGM03C744twcXIKLEDQqew6wqcZnlzKT1/h38u1CKPoy1alXqRJz
RPuDUAGApYi1ZOVOfY16d8qaYctKIjCovac8JSVlVPK7z2Ugk7HT88Rj6C+AvhRv
EPJKq2RbjLwOqqgJdLFaC8ilABSNs7MVL9+TMZOWShw1N1JlfHiNPr9sYlAIQ4T9
jwI2DcJDf0h1AElojT1tsx04e89Pk2r2JsBXE2zoDBSjlgwEq3lNX3kJb8RIBezL
HxDMHMsdTrl4/kfxxnqRzwZGf8U8pA0GtCtO3ZeE1cyh+Ifv8lxo8VgQdCHz+n1J
NY1rpQRoOflGTO07tEKlBk1RDdD4n6ETPGOZKuedfjYIygwI/eccM21aniTpogAn
FAdInB1zznNhpY/MaKYAgy6sSAkzkoiQf81AajEZI1q8BZviCJLH9zOlWUMJ6c5o
X1lC265GpogNx610+/hglfHsf1/f9BU5J3SI8Zoq9UimyKJM7LAHlRvkMytIj69L
sF3DzlMPmNbcT1oOhyflSTqBo9cQf5cmjO5O/aXyvf3OzDyvKHQAqhpdcfUd2vvN
Mm0/K5u7atX2F0CS2Rc2UkrAILqq4i1Jrt5xtqWLRcfiNcXPZWhqiglToTM0imbY
tE9MST08iMVezi7cCvk/
=BslF
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
devscripts-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
