diff options
| author |   Constantin Musca <constantinx.musca@intel.com> | 2012-08-28 17:02:40 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-02 05:47:34 -0700 |
| commit | 02e8b5c1fd68fa18ee81ba2920cd48fea8a1ef5e (patch) | |
| tree | d21c72974b7f9b7b7e833c3e170d32a9e92e23a7 /meta/recipes-devtools/dpkg/dpkg/check_version.patch | |
| parent | 2df064ad46c1510fa8a401c22db4ab3278c3c807 (diff) | |
| download | openembedded-core-02e8b5c1fd68fa18ee81ba2920cd48fea8a1ef5e.tar.gz | |
dpkg: upgrade to 1.16.8
autofoo.patch: removed
- the patch is not used
check_version: adapted to the new version
- adapt the linux-wrs kernel version, which has character '_'
- remove the first-char-digit-check (as the 1.15.8.5 version does)
dpkg-deb-avoid-fflush.patch: removed
- the patch is included in the new version
fix-timestamps.patch: added
- the lutimes function doesn't work properly for all systems
ignore_extra_fields.patch: adapted to the new version
nochroot.patch: removed
- the patch is not used
noman.patch: adapted to the new version
noupdalt.patch: removed
- the patch is not used
perllibdir.patch: removed
- in the new version PERL_LIBDIR will be set only if empty
preinst.patch: adapted to new version
removed-tar-no-timestamp.patch: added
- the busybox-1.19.4 tar utility doesn't support --warning=no-timestamp
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
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 @@ Adapt to linux-wrs kernel version, which has character '_' inside. +Remove the first-char-digit-check (as the 1.15.8.5 version does). Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> +Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Upstream-Status: Inappropriate [embedded specific] -diff -ruN dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c dpkg-1.15.8.5/lib/dpkg/parsehelp.c ---- dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c 2010-10-08 12:27:15.058572774 +0800 -+++ dpkg-1.15.8.5/lib/dpkg/parsehelp.c 2010-10-09 11:18:15.484190771 +0800 -@@ -268,11 +268,11 @@ +Index: dpkg-1.16.8/lib/dpkg/parsehelp.c +=================================================================== +--- dpkg-1.16.8.orig/lib/dpkg/parsehelp.c ++++ dpkg-1.16.8/lib/dpkg/parsehelp.c +@@ -258,14 +258,12 @@ parseversion(struct dpkg_version *rversi /* XXX: Would be faster to use something like cisversion and cisrevision. */ - for (ptr = rversion->version; *ptr; ptr++) { + ptr = rversion->version; +- if (*ptr && !cisdigit(*ptr++)) +- return dpkg_put_warn(err, _("version number does not start with digit")); + for (; *ptr; ptr++) { - if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:", *ptr) == NULL) + if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL) - return _("invalid character in version number"); + return dpkg_put_warn(err, _("invalid character in version number")); } for (ptr = rversion->revision; *ptr; ptr++) { -- if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~", *ptr) == NULL) +- if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".+~", *ptr) == NULL) + if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) - return _("invalid character in revision number"); + return dpkg_put_warn(err, _("invalid character in revision number")); } - |