dpkg: upgrade to v1.22.0
PATCH 1/1 dpkg: upgrade to v1.22.0
Changes:
Use main branch
Rebase patch
Signed-off-by Sudip Mukherjee <[email protected]>
---
...pt-to-linux-wrs-kernel-version-which-has-characte.patch | 7 +++----
.../dpkg/{dpkg_1.21.22.bb => dpkg_1.22.0.bb} | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
rename meta/recipes-devtools/dpkg/{dpkg_1.21.22.bb => dpkg_1.22.0.bb} (93%)meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch +3 -4
@@ -13,14 +13,14 @@ Upstream-Status: Inappropriate [embedded specific] 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c -index 453077fd9..f42ea2882 100644 +index 63a36f55c..81901bd5a 100644 --- a/lib/dpkg/parsehelp.c +++ b/lib/dpkg/parsehelp.c -@@ -243,14 +243,12 @@ parseversion(struct dpkg_version *rversion, const char *string, +@@ -275,14 +275,12 @@ parseversion(struct dpkg_version *rversion, const char *string, ptr = rversion->version; if (!*ptr) return dpkg_put_error(err, _("version number is empty")); -- if (*ptr && !c_isdigit(*ptr++)) +- if (!c_isdigit(*ptr++)) - return dpkg_put_warn(err, _("version number does not start with digit")); for (; *ptr; ptr++) { - if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:", *ptr) == NULL)
@@ -32,7 +32,6 @@ index 453077fd9..f42ea2882 100644 + if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) return dpkg_put_warn(err, _("invalid character in revision number")); } - -- 2.11.0
meta/recipes-devtools/dpkg/dpkg_1.22.0.bb renamed from meta/recipes-devtools/dpkg/dpkg_1.21.22.bb +2 -2
@@ -1,7 +1,7 @@ require dpkg.inc LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.21.x \ +SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main \ file://noman.patch \ file://remove-tar-no-timestamp.patch \ file://arch_pm.patch \
@@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.21. SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRCREV = "48482e4f16467e05a08aa3b3b8048e08f0024609" +SRCREV = "744487c98a622b9b38c22c6ca330315af4a30a11" S = "${WORKDIR}/git"
Signature · 1 line
2.39.2