From e2aff3d7f5446a3d59bd9a61a93a352f9ab59d40 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 26 Oct 2015 18:45:01 +0100 Subject: [PATCH] scancpan: README as default license file add this heuristic when no specific license file is found Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/perl-db-file/perl-db-file.mk | 1 + package/perl-digest-sha1/perl-digest-sha1.mk | 1 + package/perl-io-socket-ssl/perl-io-socket-ssl.mk | 1 + package/perl-mail-dkim/perl-mail-dkim.mk | 1 + package/perl-mailtools/perl-mailtools.mk | 1 + package/perl-timedate/perl-timedate.mk | 1 + package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk | 1 + package/perl-xml-sax-base/perl-xml-sax-base.mk | 1 + support/scripts/scancpan | 3 +++ 9 files changed, 11 insertions(+) diff --git a/package/perl-db-file/perl-db-file.mk b/package/perl-db-file/perl-db-file.mk index 1011632ce1..6d611ea9a4 100644 --- a/package/perl-db-file/perl-db-file.mk +++ b/package/perl-db-file/perl-db-file.mk @@ -9,5 +9,6 @@ PERL_DB_FILE_SOURCE = DB_File-$(PERL_DB_FILE_VERSION).tar.gz PERL_DB_FILE_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PM/PMQS PERL_DB_FILE_DEPENDENCIES = berkeleydb PERL_DB_FILE_LICENSE = Artistic or GPLv1+ +PERL_DB_FILE_LICENSE_FILES = README $(eval $(perl-package)) diff --git a/package/perl-digest-sha1/perl-digest-sha1.mk b/package/perl-digest-sha1/perl-digest-sha1.mk index 1d7601b81b..52b9ec355e 100644 --- a/package/perl-digest-sha1/perl-digest-sha1.mk +++ b/package/perl-digest-sha1/perl-digest-sha1.mk @@ -8,5 +8,6 @@ PERL_DIGEST_SHA1_VERSION = 2.13 PERL_DIGEST_SHA1_SOURCE = Digest-SHA1-$(PERL_DIGEST_SHA1_VERSION).tar.gz PERL_DIGEST_SHA1_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS PERL_DIGEST_SHA1_LICENSE = Artistic or GPLv1+ +PERL_DIGEST_SHA1_LICENSE_FILES = README $(eval $(perl-package)) diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index fcf914c5a5..a75d8af1b7 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -9,5 +9,6 @@ PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_DEPENDENCIES = perl-net-ssleay PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPLv1+ +PERL_IO_SOCKET_SSL_LICENSE_FILES = README $(eval $(perl-package)) diff --git a/package/perl-mail-dkim/perl-mail-dkim.mk b/package/perl-mail-dkim/perl-mail-dkim.mk index 8c7926f7ad..03a3b7442d 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.mk +++ b/package/perl-mail-dkim/perl-mail-dkim.mk @@ -8,5 +8,6 @@ PERL_MAIL_DKIM_VERSION = 0.40 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JA/JASLONG PERL_MAIL_DKIM_DEPENDENCIES = perl-crypt-openssl-rsa perl-mailtools perl-net-dns +PERL_MAIL_DKIM_LICENSE_FILES = README $(eval $(perl-package)) diff --git a/package/perl-mailtools/perl-mailtools.mk b/package/perl-mailtools/perl-mailtools.mk index 88f3a9f4c3..d3c049d597 100644 --- a/package/perl-mailtools/perl-mailtools.mk +++ b/package/perl-mailtools/perl-mailtools.mk @@ -9,5 +9,6 @@ PERL_MAILTOOLS_SOURCE = MailTools-$(PERL_MAILTOOLS_VERSION).tar.gz PERL_MAILTOOLS_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MA/MARKOV PERL_MAILTOOLS_DEPENDENCIES = perl-timedate PERL_MAILTOOLS_LICENSE = Artistic or GPLv1+ +PERL_MAILTOOLS_LICENSE_FILES = README $(eval $(perl-package)) diff --git a/package/perl-timedate/perl-timedate.mk b/package/perl-timedate/perl-timedate.mk index b7fcd0880e..4c594fb799 100644 --- a/package/perl-timedate/perl-timedate.mk +++ b/package/perl-timedate/perl-timedate.mk @@ -8,5 +8,6 @@ PERL_TIMEDATE_VERSION = 2.30 PERL_TIMEDATE_SOURCE = TimeDate-$(PERL_TIMEDATE_VERSION).tar.gz PERL_TIMEDATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GB/GBARR PERL_TIMEDATE_LICENSE = Artistic or GPLv1+ +PERL_TIMEDATE_LICENSE_FILES = README $(eval $(perl-package)) diff --git a/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk b/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk index 727b9b8ae8..31b71c13e5 100644 --- a/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk +++ b/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk @@ -8,5 +8,6 @@ PERL_XML_NAMESPACESUPPORT_VERSION = 1.11 PERL_XML_NAMESPACESUPPORT_SOURCE = XML-NamespaceSupport-$(PERL_XML_NAMESPACESUPPORT_VERSION).tar.gz PERL_XML_NAMESPACESUPPORT_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PERIGRIN PERL_XML_NAMESPACESUPPORT_LICENSE = Artistic or GPLv1+ +PERL_XML_NAMESPACESUPPORT_LICENSE_FILES = README $(eval $(perl-package)) diff --git a/package/perl-xml-sax-base/perl-xml-sax-base.mk b/package/perl-xml-sax-base/perl-xml-sax-base.mk index de47ea413a..60dec31695 100644 --- a/package/perl-xml-sax-base/perl-xml-sax-base.mk +++ b/package/perl-xml-sax-base/perl-xml-sax-base.mk @@ -8,5 +8,6 @@ PERL_XML_SAX_BASE_VERSION = 1.08 PERL_XML_SAX_BASE_SOURCE = XML-SAX-Base-$(PERL_XML_SAX_BASE_VERSION).tar.gz PERL_XML_SAX_BASE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM PERL_XML_SAX_BASE_LICENSE = Artistic or GPLv1+ +PERL_XML_SAX_BASE_LICENSE_FILES = README $(eval $(perl-package)) diff --git a/support/scripts/scancpan b/support/scripts/scancpan index 1835fea378..0436d2a4b9 100755 --- a/support/scripts/scancpan +++ b/support/scripts/scancpan @@ -544,6 +544,9 @@ sub find_license_files { next if m|/|; push @license_files, $_ if m/(ARTISTIC|COPYING|COPYRIGHT|LICENSE)/i; } + if (scalar @license_files == 0 && $manifest =~ m/(README)[\n\s]/i) { + @license_files = ($1); + } return \@license_files; }