From patchwork Mon Aug 13 13:11:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher McCrory X-Patchwork-Id: 956968 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XouFdShO"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41px2v5rFXz9s7c for ; Mon, 13 Aug 2018 23:12:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 11B6786511; Mon, 13 Aug 2018 13:12:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hUGUX4SmI8FT; Mon, 13 Aug 2018 13:12:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A5B3E864D4; Mon, 13 Aug 2018 13:12:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4E14A1BFD9C for ; Mon, 13 Aug 2018 13:11:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4B6E7864F3 for ; Mon, 13 Aug 2018 13:11:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 93-S3sc0ynUZ for ; Mon, 13 Aug 2018 13:11:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id C5B23864D4 for ; Mon, 13 Aug 2018 13:11:58 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id l9-v6so7627584pff.9 for ; Mon, 13 Aug 2018 06:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FRkcsOLw37IuCH1I7LAtso20HOVKm8BVmQXQJBj1PGo=; b=XouFdShOu/XJnQc+5LQ93TgEBuFavRgma1pIGUR/WnV1oWDjZxXD7ep7LB5KFpXqTS MXoIkybVnOzW4/JhRy5oO08qm0z1RFO1vzE4Ht+ww5MhzH7M59saD3AZulXVlltS0xS3 gVfvuULTHyF59vaVP0Mro4vSm5TJFyW6rD6SD95xcZGzIQ90UIMp7EbrH2D3p4H8DGGS x/QTR3/d2uRc026EA6HSdtnNtGQLCIhpPbiP+f5QRg7dOxIvzow36IgAJMbfhmw5bvOU cHSe8SjvwRzgLzH/bvY1LkitkhxIE8GgIBkK6XYVqj6Cn6MCzoG9DPSEwHfjbKhfi2KK UgdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FRkcsOLw37IuCH1I7LAtso20HOVKm8BVmQXQJBj1PGo=; b=oybVwTuV5htZ8GjvIk8kqnw9HQ6468uLD8/lPnUHZTrv3pNTeTeyW/5ynznVtkdbQG IzYIAts5ScdpL6rQWQQyK+vq1CqULj+f485g63Eo0mEKtyELpPGQ0Hmf4f8zLytfQCOx 9pJachzUDem9xuZC08Labk12Z9CF4E1LR9Uk9GG4ZvKi2ZyqmRrLxIXr4tm/n0rgXujX /eaWKI9DydAgqIeJL4T4qKE8D3HNc9L0Bil+1YcOVPkWhF2q4oargSn6tF1LFVasrBHL 9Yom+p0pWP3Bx9smizdd19PAttZCS7HP0I7gTsgIG8H/Z9uyP0LwdOiW+dTsimF9fatJ jltA== X-Gm-Message-State: AOUpUlFDSZxxGmv3J/Zy/7lhyjPWd2DL/aJuwHiTjpRenn8FbfFmj7QS tzm30UpDHMXoIBsi3mjx22iN3fry X-Google-Smtp-Source: AA+uWPw7crP7kHGI9qpyOYVGk626SVanlnM2f5gCpK3xSAs1QftV4ieFqypnjwymlLCLhG8A+wME4Q== X-Received: by 2002:a63:d857:: with SMTP id k23-v6mr8100266pgj.106.1534165918222; Mon, 13 Aug 2018 06:11:58 -0700 (PDT) Received: from localhost.localdomain ([2600:1012:b047:e26:949e:5221:d281:458d]) by smtp.gmail.com with ESMTPSA id l85-v6sm32310340pfk.34.2018.08.13.06.11.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Aug 2018 06:11:57 -0700 (PDT) From: Christopher McCrory To: buildroot@buildroot.org Date: Mon, 13 Aug 2018 06:11:34 -0700 Message-Id: <20180813131135.32651-2-chrismcc@gmail.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180813131135.32651-1-chrismcc@gmail.com> References: <20180813131135.32651-1-chrismcc@gmail.com> Subject: [Buildroot] [RFC PATCH 1/2] scancpan: support more licenses X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christopher McCrory MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" from perl-module-build Module/Build/Base.pm %licenses GPL, LGPT, and BSD Signed-off-by: Christopher McCrory Acked-by: Francois Perrad Signed-off-by: Christopher McCrory <chrismcc@gmail.com>

Acked-by: Francois Perrad <francois.perrad@gadz.org>
 
--- utils/scancpan | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/utils/scancpan b/utils/scancpan index da8e7b91ac..2070e2a233 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -692,8 +692,19 @@ while (my ($distname, $dist) = each %dist) { : $dist->{license}; # BR requires license name as in http://spdx.org/licenses/ $license =~ s|apache_2_0|Apache-2.0|; + $license =~ s|apache_1_1|Apache-1.1|; + $license =~ s|apache|Apache-2.0|; $license =~ s|artistic_2|Artistic-2.0|; + $license =~ s|artistic|Artistic-1.0|; + $license =~ s|lgpl_2_1|LGPL-2.1|; + $license =~ s|lgpl_3_0|LGPL-3.0|; + $license =~ s|lgpl|LGPL-2.1|; + $license =~ s|bsd|BSD|; + $license =~ s|gpl_2|GPL-2.0|; + $license =~ s|gpl_3|GPL-3.0|; + $license =~ s|gpl|GPL-1.0|; $license =~ s|mit|MIT|; + $license =~ s|mozilla_1_1|Mozilla-1.1|; $license =~ s|openssl|OpenSSL|; $license =~ s|perl_5|Artistic or GPL-1.0+|; my $license_files = join q{ }, keys %{$license_files{$distname}}; From patchwork Mon Aug 13 13:11:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher McCrory X-Patchwork-Id: 956970 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="btZbrecD"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41px2z0JKbz9s9l for ; Mon, 13 Aug 2018 23:12:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7D32386908; Mon, 13 Aug 2018 13:12:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0aVw9dtUs7my; Mon, 13 Aug 2018 13:12:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5121B864F3; Mon, 13 Aug 2018 13:12:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 884CF1BFD9C for ; Mon, 13 Aug 2018 13:12:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8611E864F3 for ; Mon, 13 Aug 2018 13:12:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AkbJa6x9vWiR for ; Mon, 13 Aug 2018 13:12:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1A3E7864D4 for ; Mon, 13 Aug 2018 13:12:00 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id r5-v6so7504108pgv.0 for ; Mon, 13 Aug 2018 06:12:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SvJ8aR+kJ1bN52+kGAGOHiCMjjpNRm6w499hmhSIjvo=; b=btZbrecDNIu2FJiV5CaWjMKu89KvoujyTAE26MVhULlqfIyosCXm9AO83ODgdTbQ6a P1vIExTXJaztNtIRHZxq28iwySNtx8qIuGjj3MeVSY6/XWwUyfGus3DesltAHWl2C+5T 7O8a223cKclXQ/YIme93F4y2vH66rvKM6iAPLtR6HB1w3dfd3OESsICWZbBXNWkKANGv huhjl39Bc3HLOhZzzQ6HHDUmveC4jVpW9AjJe53YPQ4oz9vGScMzVSWgi/uzC8yZ6pvh 1N5YWuptiZmfL/1EuVkRrQUIVO90zWE7jF5XGHvuvt/bvJR+whCQm5xI8V0RP9u8GQhf HY/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SvJ8aR+kJ1bN52+kGAGOHiCMjjpNRm6w499hmhSIjvo=; b=VB2S4wMScIsqhH543mwBNyvIavV6ihFd19SK22I00kL1eAgUvc7Y0KcTfzUETy6hwl SiSdW9XZfviopCCIi7yE1VnovVC2W3BLgEL6Dzevx62JalS/c1+xJ6tLrnr5epbLvzpM NT+PzrUWg3mEF9OIbvBC57M3o8axtUrmbOLmP1Y+znH4wNPBEGEO9yzdommXP5OBonxE o/mPnZib0K0VP/rpgYUG7D92IfLVeaxwB5c2b8zifc6bQCXLerqCf/GpEDPYEyIW+8+t 8uKtHPZQwBFojjqtDe+2Zmu8TAB/32py/mECVEaBx4PykNKkvPCRvT3YAUT5eFGzVuIZ nhig== X-Gm-Message-State: AOUpUlGQ5fejfk3qq2u6bZv5bjzNtpOVglKciruoBUQvMhf3BxN5fyiJ CpGesbg6jRKqY0OjibbE1iUAUTPm X-Google-Smtp-Source: AA+uWPy0ZyfTGh1U3zpfMxkkxl9epFDE6sZVuKrXzcYFYFUT/2hBG7gr+zY88Z6+vNdx0w2Gt7I0Ng== X-Received: by 2002:a63:5c7:: with SMTP id 190-v6mr16690193pgf.385.1534165919515; Mon, 13 Aug 2018 06:11:59 -0700 (PDT) Received: from localhost.localdomain ([2600:1012:b047:e26:949e:5221:d281:458d]) by smtp.gmail.com with ESMTPSA id l85-v6sm32310340pfk.34.2018.08.13.06.11.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Aug 2018 06:11:58 -0700 (PDT) From: Christopher McCrory To: buildroot@buildroot.org Date: Mon, 13 Aug 2018 06:11:35 -0700 Message-Id: <20180813131135.32651-3-chrismcc@gmail.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180813131135.32651-1-chrismcc@gmail.com> References: <20180813131135.32651-1-chrismcc@gmail.com> Subject: [Buildroot] [RFC PATCH 2/2] scancpan: wrap abstract if too long X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christopher McCrory MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Christopher McCrory --- utils/scancpan | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/scancpan b/utils/scancpan index 2070e2a233..f8411079e1 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -484,6 +484,8 @@ use HTTP::Tiny; use Safe; use MetaCPAN::API::Tiny; use Digest::SHA qw(sha256_hex); +use Text::Wrap; +$Text::Wrap::columns = 70; # Below, 5.026 should be aligned with the version of perl actually # bundled in Buildroot: @@ -655,7 +657,7 @@ while (my ($distname, $dist) = each %dist) { my $brname = brname( $fsname ); mkdir $dirname unless -d $dirname; if ($need_target{$distname} && ($force || !-f $cfgname)) { - my $abstract = $dist->{abstract}; + my $abstract = wrap("","\t ",$dist->{abstract}); my $homepage = $dist->{resources}->{homepage} || qq{https://metacpan.org/release/${distname}}; say qq{write ${cfgname}} unless $quiet; open my $fh, q{>}, $cfgname;