@@ -1,4 +1,4 @@
-From 708c765ffb41ecc734316f69043583312fe444bd Mon Sep 17 00:00:00 2001
+From 04fd678939ad0c21f57222c48305bfa29c8f6cf3 Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com>
Date: Tue, 15 May 2018 17:17:01 +0800
Subject: [PATCH] diffstat: fix wrong evaluation of CC
@@ -12,16 +12,15 @@ be included in CC. And then CC will be wrongly filtered.
So comment out CF_CC_ENV_FLAGS from function CF_PROG_CC.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
---
aclocal.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/aclocal.m4 b/aclocal.m4
-index d4bd283..1b653c4 100644
+index 1c653ea..8f0540d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
-@@ -1522,7 +1522,7 @@ CF_GCC_VERSION
+@@ -1584,7 +1584,7 @@ CF_GCC_VERSION
CF_ACVERSION_CHECK(2.52,
[AC_PROG_CC_STDC],
[CF_ANSI_CC_REQD])
similarity index 18%
rename from meta/recipes-devtools/diffstat/diffstat_1.66.bb
rename to meta/recipes-devtools/diffstat/diffstat_1.67.bb
@@ -1,3 +1,55 @@
+# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
+# The following is the difference between the old and the new license text.
+# Please update the LICENSE value if needed, and summarize the changes in
+# the commit message via 'License-Update:' tag.
+# (example: 'License-Update: copyright years updated.')
+#
+# The changes:
+#
+# --- COPYING
+# +++ COPYING
+# @@ -1,18 +1,22 @@
+# -Copyright 1994-2023,2024 by Thomas E. Dickey
+# -All Rights Reserved.
+# +Copyright 1994-2023,2024 by Thomas E. Dickey
+#
+# -Permission to use, copy, modify, and distribute this software and its
+# -documentation for any purpose and without fee is hereby granted, provided
+# -that the above copyright notice appear in all copies and that both that
+# -copyright notice and this permission notice appear in supporting
+# -documentation, and that the name of the above listed copyright holder(s)
+# -not be used in advertising or publicity pertaining to distribution of the
+# -software without specific, written prior permission.
+# +Permission is hereby granted, free of charge, to any person obtaining a copy of
+# +this software and associated documentation files (the "Software"), to deal in
+# +the Software without restriction, including without limitation the rights to
+# +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# +of the Software, and to permit persons to whom the Software is furnished to do
+# +so, subject to the following conditions:
+#
+# -THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+# -TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# -FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE
+# -FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+# -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# +The above copyright notice and this permission notice shall be included in all
+# +copies or substantial portions of the Software.
+# +
+# +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# +ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# +
+# +Except as contained in this notice, the name(s) of the above copyright holders
+# +shall not be used in advertising or otherwise to promote the sale, use or other
+# +dealings in this Software without prior written authorization.
+#
+#
+
SUMMARY = "Tool to produce a statistics based on a diff"
DESCRIPTION = "diffstat reads the output of diff and displays a histogram of \
the insertions, deletions, and modifications per-file. It is useful for \
@@ -5,14 +57,14 @@ reviewing large, complex patch files."
HOMEPAGE = "http://invisible-island.net/diffstat/"
SECTION = "devel"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5713b4719a66a6527e6301e8f8745877"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6232ea974e4cbc4ee06b49ed53df6ece"
SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
file://run-ptest \
file://avoid-check-user-break-cc.patch \
"
-SRC_URI[sha256sum] = "f54531bbe32e8e0fa461f018b41e3af516b632080172f361f05e50367ecbb69e"
+SRC_URI[sha256sum] = "760ed0c99c6d643238d41b80e60278cf1683ffb94a283954ac7ef168c852766a"
inherit autotools gettext ptest
Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *diffstat* to *1.67* has Succeeded. Next steps: - apply the patch: git am 0001-diffstat-upgrade-1.66-1.67.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 48965a72a6d0eb72ab07965ecce1904cb1504802 Mon Sep 17 00:00:00 2001 From: Upgrade Helper <auh@yoctoproject.org> Date: Sat, 16 Nov 2024 09:04:56 +0000 Subject: [PATCH] diffstat: upgrade 1.66 -> 1.67 --- .../diffstat/avoid-check-user-break-cc.patch | 7 +-- .../{diffstat_1.66.bb => diffstat_1.67.bb} | 56 ++++++++++++++++++- 2 files changed, 57 insertions(+), 6 deletions(-) rename meta/recipes-devtools/diffstat/{diffstat_1.66.bb => diffstat_1.67.bb} (18%)