diff options
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg/check_version.patch')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/check_version.patch | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/check_version.patch b/meta/recipes-devtools/dpkg/dpkg/check_version.patch index 524e715c01..3175731522 100644 --- a/meta/recipes-devtools/dpkg/dpkg/check_version.patch +++ b/meta/recipes-devtools/dpkg/dpkg/check_version.patch | |||
@@ -1,23 +1,28 @@ | |||
1 | Adapt to linux-wrs kernel version, which has character '_' inside. | 1 | Adapt to linux-wrs kernel version, which has character '_' inside. |
2 | Remove the first-char-digit-check (as the 1.15.8.5 version does). | ||
2 | 3 | ||
3 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | 4 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> |
5 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
4 | 6 | ||
5 | Upstream-Status: Inappropriate [embedded specific] | 7 | Upstream-Status: Inappropriate [embedded specific] |
6 | 8 | ||
7 | diff -ruN dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c dpkg-1.15.8.5/lib/dpkg/parsehelp.c | 9 | Index: dpkg-1.16.8/lib/dpkg/parsehelp.c |
8 | --- dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c 2010-10-08 12:27:15.058572774 +0800 | 10 | =================================================================== |
9 | +++ dpkg-1.15.8.5/lib/dpkg/parsehelp.c 2010-10-09 11:18:15.484190771 +0800 | 11 | --- dpkg-1.16.8.orig/lib/dpkg/parsehelp.c |
10 | @@ -268,11 +268,11 @@ | 12 | +++ dpkg-1.16.8/lib/dpkg/parsehelp.c |
13 | @@ -258,14 +258,12 @@ parseversion(struct dpkg_version *rversi | ||
11 | 14 | ||
12 | /* XXX: Would be faster to use something like cisversion and cisrevision. */ | 15 | /* XXX: Would be faster to use something like cisversion and cisrevision. */ |
13 | for (ptr = rversion->version; *ptr; ptr++) { | 16 | ptr = rversion->version; |
17 | - if (*ptr && !cisdigit(*ptr++)) | ||
18 | - return dpkg_put_warn(err, _("version number does not start with digit")); | ||
19 | for (; *ptr; ptr++) { | ||
14 | - if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:", *ptr) == NULL) | 20 | - if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:", *ptr) == NULL) |
15 | + if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL) | 21 | + if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL) |
16 | return _("invalid character in version number"); | 22 | return dpkg_put_warn(err, _("invalid character in version number")); |
17 | } | 23 | } |
18 | for (ptr = rversion->revision; *ptr; ptr++) { | 24 | for (ptr = rversion->revision; *ptr; ptr++) { |
19 | - if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~", *ptr) == NULL) | 25 | - if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".+~", *ptr) == NULL) |
20 | + if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) | 26 | + if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) |
21 | return _("invalid character in revision number"); | 27 | return dpkg_put_warn(err, _("invalid character in revision number")); |
22 | } | 28 | } |
23 | |||