diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2014-11-24 15:16:31 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-25 08:18:13 +0000 |
commit | 172ea4f79e3b5a4256604d404bc9f74c255a8c85 (patch) | |
tree | c6eff8a1451a88b190535bae98f1c0241ca9de6b /meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch | |
parent | f6cf293bbd22b4a0a4d5ab350ea5d3d9e8705ca1 (diff) | |
download | poky-172ea4f79e3b5a4256604d404bc9f74c255a8c85.tar.gz |
dpkg: Upgrade to 1.17.21
Remove dpkg-1.17.4-CVE-2014-0471, dpkg-1.17.4-CVE-2014-0471-CVE-2014-3127 and
ignore_extra_fields patches that are already in upstream.
Rebase no-vla-warning patch.
(From OE-Core rev: d09ea40d7f5b59f37625e43973c363c07053fdfb)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch deleted file mode 100644 index 4e3eb97ed8..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [workaround] | ||
2 | |||
3 | Index: dpkg-1.16.8/dpkg-deb/build.c | ||
4 | =================================================================== | ||
5 | --- dpkg-1.16.8.orig/dpkg-deb/build.c | ||
6 | +++ dpkg-1.16.8/dpkg-deb/build.c | ||
7 | @@ -340,13 +340,13 @@ check_new_pkg(const char *dir) | ||
8 | if (pkg->priority == pri_other) | ||
9 | warning(_("'%s' contains user-defined Priority value '%s'"), | ||
10 | controlfile, pkg->otherpriority); | ||
11 | - for (field = pkg->available.arbs; field; field = field->next) { | ||
12 | + /*for (field = pkg->available.arbs; field; field = field->next) { | ||
13 | if (known_arbitrary_field(field)) | ||
14 | continue; | ||
15 | |||
16 | warning(_("'%s' contains user-defined field '%s'"), controlfile, | ||
17 | field->name); | ||
18 | - } | ||
19 | + }*/ | ||
20 | |||
21 | free(controlfile); | ||