diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-08-28 15:18:51 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-01 11:44:03 +0100 |
commit | e444e84935f5a25799e1a7c88e886fa6e8a9b9d4 (patch) | |
tree | 8590fca8ce102c6544641d35f077c38bf1190e6b /meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch | |
parent | eb45cd659bf06fdf1ba4c377db2aac268ecf6e31 (diff) | |
download | poky-e444e84935f5a25799e1a7c88e886fa6e8a9b9d4.tar.gz |
dpkg: update to 1.18.2
check_snprintf.patch has been dropped, because it seems to fix a problem
that doesn't anymore exist, and doesn't have any description of what the
problem was and how was it fixed.
tarfix.patch has been merged upstream.
The rest of the patches have been rebased to the new upstream release
(From OE-Core rev: c11b2be13a6d5e34f2baed4b8ee8ccd66438c1de)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch new file mode 100644 index 0000000000..231a6a2909 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From b4ea54158c399874e12394ebc91afe98954695e2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 26 Aug 2015 16:16:16 +0300 | ||
4 | Subject: [PATCH 2/5] Adapt to linux-wrs kernel version, which has character | ||
5 | '_' inside. Remove the first-char-digit-check (as the 1.15.8.5 version does). | ||
6 | |||
7 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
8 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
9 | |||
10 | Upstream-Status: Inappropriate [embedded specific] | ||
11 | --- | ||
12 | lib/dpkg/parsehelp.c | 6 ++---- | ||
13 | 1 file changed, 2 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c | ||
16 | index 79b2908..7758aa5 100644 | ||
17 | --- a/lib/dpkg/parsehelp.c | ||
18 | +++ b/lib/dpkg/parsehelp.c | ||
19 | @@ -235,14 +235,12 @@ parseversion(struct dpkg_version *rversion, const char *string, | ||
20 | |||
21 | /* XXX: Would be faster to use something like cisversion and cisrevision. */ | ||
22 | ptr = rversion->version; | ||
23 | - if (*ptr && !c_isdigit(*ptr++)) | ||
24 | - return dpkg_put_warn(err, _("version number does not start with digit")); | ||
25 | for (; *ptr; ptr++) { | ||
26 | - if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:", *ptr) == NULL) | ||
27 | + if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL) | ||
28 | return dpkg_put_warn(err, _("invalid character in version number")); | ||
29 | } | ||
30 | for (ptr = rversion->revision; *ptr; ptr++) { | ||
31 | - if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".+~", *ptr) == NULL) | ||
32 | + if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) | ||
33 | return dpkg_put_warn(err, _("invalid character in revision number")); | ||
34 | } | ||
35 | |||
36 | -- | ||
37 | 2.1.4 | ||
38 | |||