Remove unused patches, packageconfigs
cover Remove unused patches, packageconfigs
All of the unused patches seem to be unused on purpose (instead of just being missing from SRC_URI by accident), so have been removed.
Cheers,
Jussi
The following changes since commit 812fabbd30a062f6e726e6ae0399d87e85bf7fa3:
bitbake: runqueue: minor typo fix (2017-03-15 17:38:33 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/obsolete-patches
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/obsolete-patches
Jussi Kukkonen (11):
qemu: Remove uuid PACKAGECONFIG
readline: Remove unused patch
xf86-input-mouse: Remove unused patch
python3: Remove unused patches
python: Remove unused patches
python-native: Remove unused patch
gcc: Remove unused patch
opkg-utils: Remove unused patches
gstreamer1.0-omx: Remove unused patch
gstreamer1.0-vaapi: Remove unused patch
kexec-tools: Remove unused patch
.../readline/files/config-dirent-symbols.patch | 34 --- .../gcc/gcc-6.3/CVE-2016-4490.patch | 290 --------------------- ...e-defined-bindir-and-mandir-as-installati.patch | 30 --- ...rnatives-warn-when-multiple-providers-hav.patch | 26 -- .../avoid_parallel_make_races_on_pgen.patch | 27 -- .../python/python/CVE-2016-5636.patch | 44 ---- .../python/avoid_parallel_make_races_on_pgen.patch | 27 -- .../python/python3/CVE-2016-5636.patch | 44 ---- .../python/python3/use_packed_importlib.patch | 31 --- meta/recipes-devtools/qemu/qemu.inc | 3 +- .../xorg-driver/xf86-input-mouse/unbreak.patch | 21 -- .../kexec/kexec-tools/kexec-x32.patch | 88 ------- .../0001-omx-fixed-type-error-in-printf-call.patch | 30 --- .../gstreamer1.0-vaapi/install-tests.patch | 43 --- 14 files changed, 1 insertion(+), 737 deletions(-) delete mode 100644 meta/recipes-core/readline/files/config-dirent-symbols.patch delete mode 100644 meta/recipes-devtools/gcc/gcc-6.3/CVE-2016-4490.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch delete mode 100644 meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch delete mode 100644 meta/recipes-devtools/python/python/CVE-2016-5636.patch delete mode 100644 meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch delete mode 100644 meta/recipes-devtools/python/python3/CVE-2016-5636.patch delete mode 100644 meta/recipes-devtools/python/python3/use_packed_importlib.patch delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-omx-fixed-type-error-in-printf-call.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/install-tests.patch
Signature · 1 line
2.1.4
PATCH 1/11 qemu: Remove uuid PACKAGECONFIG
--enable-uuid no longer exists: There's a uuid implementation in libqemuutil.
--- meta/recipes-devtools/qemu/qemu.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +1 -2
@@ -79,7 +79,7 @@ PACKAGECONFIG ??= " \ fdt sdl kvm \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ " -PACKAGECONFIG_class-native ??= "fdt alsa uuid kvm" +PACKAGECONFIG_class-native ??= "fdt alsa kvm" PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm" # Handle distros such as CentOS 5 32-bit that do not have kvm support
@@ -99,7 +99,6 @@ PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpe PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng," PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl," PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss," -PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," PACKAGECONFIG[gtk+] = "--enable-gtk --with-gtkabi=3.0 --enable-vte,--disable-gtk --disable-vte,gtk+3 vte" PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
Signature · 1 line
2.1.4
PATCH 2/11 readline: Remove unused patch
In reply to Jussi Kukkonenconfig-dirent-symbols.patch was removed from SRC_URI as "already applied in upstream" in 983a4986947.
--- .../readline/files/config-dirent-symbols.patch | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 meta/recipes-core/readline/files/config-dirent-symbols.patch
meta/recipes-core/readline/files/config-dirent-symbols.patch deleted +0 -34
@@ -1,34 +0,0 @@ -Fix the names of the STRUCT_DIRENT_D symbols to match the names used by both -configure and the source code. - -Upstream-Status: Submitted (http://lists.gnu.org/archive/html/bug-readline/2014-05/msg00008.html) -Signed-off-by: Ross Burton <[email protected]> - -From e48656811550774892fd4e0f4b3c7d418422da52 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Tue, 27 May 2014 22:32:31 +0100 -Subject: [PATCH] config.h.in: fix names of STRUCT_DIRENT_D symbols - ---- - config.h.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config.h.in b/config.h.in -index a67e43e..a42acc5 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -244,9 +244,9 @@ - - #undef HAVE_GETPW_DECLS - --#undef STRUCT_DIRENT_HAS_D_INO -+#undef HAVE_STRUCT_DIRENT_D_INO - --#undef STRUCT_DIRENT_HAS_D_FILENO -+#undef HAVE_STRUCT_DIRENT_D_FILENO - - #undef HAVE_BSD_SIGNALS - --- -1.7.10.4 -
Signature · 1 line
2.1.4
PATCH 3/11 xf86-input-mouse: Remove unused patch
In reply to Jussi KukkonenThe patch has not been used since the ancient git version was removed.
--- .../xorg-driver/xf86-input-mouse/unbreak.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch deleted +0 -21
@@ -1,21 +0,0 @@ -Unbreak the linux mouse driver by using config.h - -RP - 4/11/07 - -Upstream-Status: Pending - -Index: git/src/lnx_mouse.c -=================================================================== ---- git.orig/src/lnx_mouse.c 2008-11-04 23:46:05.000000000 +0000 -+++ git/src/lnx_mouse.c 2008-11-04 23:46:15.000000000 +0000 -@@ -3,8 +3,8 @@ - * Copyright 1999 by The XFree86 Project, Inc. - */ - --#ifdef HAVE_XORG_CONFIG_H --#include <xorg-config.h> -+#ifdef HAVE_CONFIG_H -+#include <config.h> - #endif - - #include <X11/X.h>
Signature · 1 line
2.1.4
PATCH 4/11 python3: Remove unused patches
In reply to Jussi KukkonenCVE-2016-5636.patch and use_packed_importlib.patch were removed from SRC_URI as handled in upstream in b192bc02bbf91.
--- .../python/python3/CVE-2016-5636.patch | 44 ---------------------- .../python/python3/use_packed_importlib.patch | 31 --------------- 2 files changed, 75 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/CVE-2016-5636.patch delete mode 100644 meta/recipes-devtools/python/python3/use_packed_importlib.patch
meta/recipes-devtools/python/python3/CVE-2016-5636.patch deleted +0 -44
@@ -1,44 +0,0 @@ - -# HG changeset patch -# User Benjamin Peterson <[email protected]> -# Date 1453357506 28800 -# Node ID 10dad6da1b28ea4af78ad9529e469fdbf4ebbc8f -# Parent a3ac2cd93db9d5336dfd7b5b27efde2c568d8794# Parent 01ddd608b85c85952537d95a43bbabf4fb655057 -merge 3.4 (#26171) - -Upstream-Status: Backport -CVE: CVE-2016-5636 - -https://hg.python.org/cpython/raw-rev/10dad6da1b28 -Signed-off-by: Armin Kuster <[email protected]> - -Index: Python-3.5.1/Misc/NEWS -=================================================================== ---- Python-3.5.1.orig/Misc/NEWS -+++ Python-3.5.1/Misc/NEWS -@@ -91,6 +91,9 @@ Core and Builtins - Python.h header to fix a compilation error with OpenMP. PyThreadState_GET() - becomes an alias to PyThreadState_Get() to avoid ABI incompatibilies. - -+- Issue #26171: Fix possible integer overflow and heap corruption in -+ zipimporter.get_data(). -+ - Library - ------- - -Index: Python-3.5.1/Modules/zipimport.c -=================================================================== ---- Python-3.5.1.orig/Modules/zipimport.c -+++ Python-3.5.1/Modules/zipimport.c -@@ -1112,6 +1112,11 @@ get_data(PyObject *archive, PyObject *to - } - file_offset += l; /* Start of file data */ - -+ if (data_size > LONG_MAX - 1) { -+ fclose(fp); -+ PyErr_NoMemory(); -+ return NULL; -+ } - bytes_size = compress == 0 ? data_size : data_size + 1; - if (bytes_size == 0) - bytes_size++;
meta/recipes-devtools/python/python3/use_packed_importlib.patch deleted +0 -31
@@ -1,31 +0,0 @@ - -Upstream-Status: Inappropriate [embedded specific] - -The binary _freeze_importlib is built and also used during build time to generate -importlib*.h files, this is impossible to do on a cross-compile environment, -this avoids executing the binary and forces it to use the packed importlib*.h files. - - -Signed-off-by: Alejandro Hernandez <[email protected]> - -Index: Python-3.5.0/Makefile.pre.in -=================================================================== ---- Python-3.5.0.orig/Makefile.pre.in -+++ Python-3.5.0/Makefile.pre.in -@@ -700,12 +700,12 @@ Programs/_freeze_importlib.o: Programs/_ - Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) - $(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - --Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib -- ./Programs/_freeze_importlib \ -+#Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib -+# ./Programs/_freeze_importlib \ - $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h - --Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib -- ./Programs/_freeze_importlib \ -+#Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib -+# ./Programs/_freeze_importlib \ - $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h - -
Signature · 1 line
2.1.4
PATCH 5/11 python: Remove unused patches
In reply to Jussi KukkonenCVE-2016-5636.patch and avoid_parallel_make_races_on_pgen.patch were removed from SRC_URI as handled upstream in adf4266524d0d.
--- .../python/python/CVE-2016-5636.patch | 44 ---------------------- .../python/avoid_parallel_make_races_on_pgen.patch | 27 ------------- 2 files changed, 71 deletions(-) delete mode 100644 meta/recipes-devtools/python/python/CVE-2016-5636.patch delete mode 100644 meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch
meta/recipes-devtools/python/python/CVE-2016-5636.patch deleted +0 -44
@@ -1,44 +0,0 @@ - -# HG changeset patch -# User Benjamin Peterson <[email protected]> -# Date 1453357424 28800 -# Node ID 985fc64c60d6adffd1138b6cc46df388ca91ca5d -# Parent 7ec954b9fc54448a35b56d271340ba109eb381b9 -prevent buffer overflow in get_data (closes #26171) - -Upstream-Status: Backport -https://hg.python.org/cpython/rev/985fc64c60d6 - -CVE: CVE-2016-5636 -Signed-off-by: Armin Kuster <[email protected]> - -Index: Python-2.7.11/Misc/NEWS -=================================================================== ---- Python-2.7.11.orig/Misc/NEWS -+++ Python-2.7.11/Misc/NEWS -@@ -7,6 +7,9 @@ What's New in Python 2.7.11? - - *Release date: 2015-12-05* - -+- Issue #26171: Fix possible integer overflow and heap corruption in -+ zipimporter.get_data(). -+ - Library - ------- - -Index: Python-2.7.11/Modules/zipimport.c -=================================================================== ---- Python-2.7.11.orig/Modules/zipimport.c -+++ Python-2.7.11/Modules/zipimport.c -@@ -895,6 +895,11 @@ get_data(char *archive, PyObject *toc_en - PyMarshal_ReadShortFromFile(fp); /* local header size */ - file_offset += l; /* Start of file data */ - -+ if (data_size > LONG_MAX - 1) { -+ fclose(fp); -+ PyErr_NoMemory(); -+ return NULL; -+ } - raw_data = PyString_FromStringAndSize((char *)NULL, compress == 0 ? - data_size : data_size + 1); - if (raw_data == NULL) {
meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch deleted +0 -27
@@ -1,27 +0,0 @@ -Upstream-Status: Pending - -Avoids parallel make races linking errors when making Parser/PGEN - -- Implements Richard Purdie's idea - -Signed-off-by: Richard Purdie <[email protected]> -Signed-off-by: Alejandro Hernandez <[email protected]> - -Index: Python-2.7.9/Makefile.pre.in -=================================================================== ---- Python-2.7.9.orig/Makefile.pre.in -+++ Python-2.7.9/Makefile.pre.in -@@ -611,12 +611,10 @@ Modules/grpmodule.o: $(srcdir)/Modules/g - - Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule.h - --$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) -+$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) $(PGEN) - @$(MKDIR_P) Include -- $(MAKE) $(PGEN) - $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) -- $(MAKE) $(GRAMMAR_H) - touch $(GRAMMAR_C) - - $(PGEN): $(PGENOBJS)
Signature · 1 line
2.1.4
PATCH 6/11 python-native: Remove unused patch
In reply to Jussi Kukkonenavoid_parallel_make_races_on_pgen.patch was removed from SRC_URI as handled in upstream in db9508891b6.
--- .../avoid_parallel_make_races_on_pgen.patch | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch
meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch deleted +0 -27
@@ -1,27 +0,0 @@ -Upstream-Status: Pending - -Avoids parallel make races linking errors when making Parser/PGEN - -- Implements Richard Purdie's idea - -Signed-off-by: Richard Purdie <[email protected]> -Signed-off-by: Alejandro Hernandez <[email protected]> - -Index: Python-2.7.9/Makefile.pre.in -=================================================================== ---- Python-2.7.9.orig/Makefile.pre.in -+++ Python-2.7.9/Makefile.pre.in -@@ -610,12 +610,10 @@ Modules/grpmodule.o: $(srcdir)/Modules/g - - Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule.h - --$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) -+$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) $(PGEN) - @$(MKDIR_P) Include -- $(MAKE) $(PGEN) - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) -- $(MAKE) $(GRAMMAR_H) - touch $(GRAMMAR_C) - - $(PGEN): $(PGENOBJS)
Signature · 1 line
2.1.4
PATCH 7/11 gcc: Remove unused patch
In reply to Jussi KukkonenCVE-2016-4490 applied to gcc < 6.1.1, our version is 6.3
--- .../gcc/gcc-6.3/CVE-2016-4490.patch | 290 --------------------- 1 file changed, 290 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-6.3/CVE-2016-4490.patch
meta/recipes-devtools/gcc/gcc-6.3/CVE-2016-4490.patch deleted +0 -290
@@ -1,290 +0,0 @@ -From 7d235b1b5ea35352c54957ef5530d9a02c46962f Mon Sep 17 00:00:00 2001 -From: bernds <bernds@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Mon, 2 May 2016 17:06:40 +0000 -Subject: [PATCH] =?UTF-8?q?Demangler=20integer=20overflow=20fixes=20from?= - =?UTF-8?q?=20Marcel=20B=C3=B6hme.?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - PR c++/70498 - * cp-demangle.c: Parse numbers as integer instead of long to avoid - overflow after sanity checks. Include <limits.h> if available. - (INT_MAX): Define if necessary. - (d_make_template_param): Takes integer argument instead of long. - (d_make_function_param): Likewise. - (d_append_num): Likewise. - (d_identifier): Likewise. - (d_number): Parse as and return integer. - (d_compact_number): Handle overflow. - (d_source_name): Change variable type to integer for parsed number. - (d_java_resource): Likewise. - (d_special_name): Likewise. - (d_discriminator): Likewise. - (d_unnamed_type): Likewise. - * testsuite/demangle-expected: Add regression test cases. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235767 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport -CVE: CVE-2016-4490 -[Yocto #9632] - -Signed-off-by: Armin Kuster <[email protected]> - ---- - libiberty/ChangeLog | 19 +++++++++++++ - libiberty/cp-demangle.c | 52 ++++++++++++++++++++--------------- - libiberty/testsuite/demangle-expected | 14 ++++++++-- - 3 files changed, 61 insertions(+), 24 deletions(-) - -Index: git/libiberty/ChangeLog -=================================================================== ---- git.orig/libiberty/ChangeLog -+++ git/libiberty/ChangeLog -@@ -1,3 +1,22 @@ -+2016-05-02 Marcel Böhme <[email protected]> -+ -+ PR c++/70498 -+ * cp-demangle.c: Parse numbers as integer instead of long to avoid -+ overflow after sanity checks. Include <limits.h> if available. -+ (INT_MAX): Define if necessary. -+ (d_make_template_param): Takes integer argument instead of long. -+ (d_make_function_param): Likewise. -+ (d_append_num): Likewise. -+ (d_identifier): Likewise. -+ (d_number): Parse as and return integer. -+ (d_compact_number): Handle overflow. -+ (d_source_name): Change variable type to integer for parsed number. -+ (d_java_resource): Likewise. -+ (d_special_name): Likewise. -+ (d_discriminator): Likewise. -+ (d_unnamed_type): Likewise. -+ * testsuite/demangle-expected: Add regression test cases. -+ - 2016-04-27 Release Manager - - * GCC 6.1.0 released. -Index: git/libiberty/cp-demangle.c -=================================================================== ---- git.orig/libiberty/cp-demangle.c -+++ git/libiberty/cp-demangle.c -@@ -128,6 +128,13 @@ extern char *alloca (); - # endif /* alloca */ - #endif /* HAVE_ALLOCA_H */ - -+#ifdef HAVE_LIMITS_H -+#include <limits.h> -+#endif -+#ifndef INT_MAX -+# define INT_MAX (int)(((unsigned int) ~0) >> 1) /* 0x7FFFFFFF */ -+#endif -+ - #include "ansidecl.h" - #include "libiberty.h" - #include "demangle.h" -@@ -398,7 +405,7 @@ d_make_dtor (struct d_info *, enum gnu_v - struct demangle_component *); - - static struct demangle_component * --d_make_template_param (struct d_info *, long); -+d_make_template_param (struct d_info *, int); - - static struct demangle_component * - d_make_sub (struct d_info *, const char *, int); -@@ -421,9 +428,9 @@ static struct demangle_component *d_unqu - - static struct demangle_component *d_source_name (struct d_info *); - --static long d_number (struct d_info *); -+static int d_number (struct d_info *); - --static struct demangle_component *d_identifier (struct d_info *, long); -+static struct demangle_component *d_identifier (struct d_info *, int); - - static struct demangle_component *d_operator_name (struct d_info *); - -@@ -1119,7 +1126,7 @@ d_make_dtor (struct d_info *di, enum gnu - /* Add a new template parameter. */ - - static struct demangle_component * --d_make_template_param (struct d_info *di, long i) -+d_make_template_param (struct d_info *di, int i) - { - struct demangle_component *p; - -@@ -1135,7 +1142,7 @@ d_make_template_param (struct d_info *di - /* Add a new function parameter. */ - - static struct demangle_component * --d_make_function_param (struct d_info *di, long i) -+d_make_function_param (struct d_info *di, int i) - { - struct demangle_component *p; - -@@ -1620,7 +1627,7 @@ d_unqualified_name (struct d_info *di) - static struct demangle_component * - d_source_name (struct d_info *di) - { -- long len; -+ int len; - struct demangle_component *ret; - - len = d_number (di); -@@ -1633,12 +1640,12 @@ d_source_name (struct d_info *di) - - /* number ::= [n] <(non-negative decimal integer)> */ - --static long -+static int - d_number (struct d_info *di) - { - int negative; - char peek; -- long ret; -+ int ret; - - negative = 0; - peek = d_peek_char (di); -@@ -1681,7 +1688,7 @@ d_number_component (struct d_info *di) - /* identifier ::= <(unqualified source code identifier)> */ - - static struct demangle_component * --d_identifier (struct d_info *di, long len) -+d_identifier (struct d_info *di, int len) - { - const char *name; - -@@ -1702,7 +1709,7 @@ d_identifier (struct d_info *di, long le - /* Look for something which looks like a gcc encoding of an - anonymous namespace, and replace it with a more user friendly - name. */ -- if (len >= (long) ANONYMOUS_NAMESPACE_PREFIX_LEN + 2 -+ if (len >= (int) ANONYMOUS_NAMESPACE_PREFIX_LEN + 2 - && memcmp (name, ANONYMOUS_NAMESPACE_PREFIX, - ANONYMOUS_NAMESPACE_PREFIX_LEN) == 0) - { -@@ -1870,7 +1877,7 @@ d_java_resource (struct d_info *di) - { - struct demangle_component *p = NULL; - struct demangle_component *next = NULL; -- long len, i; -+ int len, i; - char c; - const char *str; - -@@ -2012,7 +2019,7 @@ d_special_name (struct d_info *di) - case 'C': - { - struct demangle_component *derived_type; -- long offset; -+ int offset; - struct demangle_component *base_type; - - derived_type = cplus_demangle_type (di); -@@ -2946,10 +2953,10 @@ d_pointer_to_member_type (struct d_info - - /* <non-negative number> _ */ - --static long -+static int - d_compact_number (struct d_info *di) - { -- long num; -+ int num; - if (d_peek_char (di) == '_') - num = 0; - else if (d_peek_char (di) == 'n') -@@ -2957,7 +2964,7 @@ d_compact_number (struct d_info *di) - else - num = d_number (di) + 1; - -- if (! d_check_char (di, '_')) -+ if (num < 0 || ! d_check_char (di, '_')) - return -1; - return num; - } -@@ -2969,7 +2976,7 @@ d_compact_number (struct d_info *di) - static struct demangle_component * - d_template_param (struct d_info *di) - { -- long param; -+ int param; - - if (! d_check_char (di, 'T')) - return NULL; -@@ -3171,9 +3178,10 @@ d_expression_1 (struct d_info *di) - } - else - { -- index = d_compact_number (di) + 1; -- if (index == 0) -+ index = d_compact_number (di); -+ if (index == INT_MAX || index == -1) - return NULL; -+ index ++; - } - return d_make_function_param (di, index); - } -@@ -3502,7 +3510,7 @@ d_local_name (struct d_info *di) - static int - d_discriminator (struct d_info *di) - { -- long discrim; -+ int discrim; - - if (d_peek_char (di) != '_') - return 1; -@@ -3558,7 +3566,7 @@ static struct demangle_component * - d_unnamed_type (struct d_info *di) - { - struct demangle_component *ret; -- long num; -+ int num; - - if (! d_check_char (di, 'U')) - return NULL; -@@ -4086,10 +4094,10 @@ d_append_string (struct d_print_info *dp - } - - static inline void --d_append_num (struct d_print_info *dpi, long l) -+d_append_num (struct d_print_info *dpi, int l) - { - char buf[25]; -- sprintf (buf,"%ld", l); -+ sprintf (buf,"%d", l); - d_append_string (dpi, buf); - } - -Index: git/libiberty/testsuite/demangle-expected -=================================================================== ---- git.orig/libiberty/testsuite/demangle-expected -+++ git/libiberty/testsuite/demangle-expected -@@ -4422,12 +4422,22 @@ void baz<int>(A<sizeof (foo((int)(), (fl - _Z3fooI1FEN1XIXszdtcl1PclcvT__EEE5arrayEE4TypeEv - X<sizeof ((P(((F)())())).array)>::Type foo<F>() - # --# Tests a use-after-free problem -+# Tests a use-after-free problem PR70481 - - _Q.__0 - ::Q.(void) - # --# Tests a use-after-free problem -+# Tests a use-after-free problem PR70481 - - _Q10-__9cafebabe. - cafebabe.::-(void) -+# -+# Tests integer overflow problem PR70492 -+ -+__vt_90000000000cafebabe -+__vt_90000000000cafebabe -+# -+# Tests write access violation PR70498 -+ -+_Z80800000000000000000000 -+_Z80800000000000000000000
Signature · 1 line
2.1.4
PATCH 8/11 opkg-utils: Remove unused patches
In reply to Jussi Kukkonen0001-update-alternatives-warn-when-multiple-providers-hav.patch was removed from SRC_URI without mention in commit 60c9a9704.
001-Makefile-use-defined-bindir-and-mandir-as-installati.patch was removed from SRC_URI in d6b04e121.
Current opkg does not need either patch.
--- ...e-defined-bindir-and-mandir-as-installati.patch | 30 ---------------------- ...rnatives-warn-when-multiple-providers-hav.patch | 26 ------------------- 2 files changed, 56 deletions(-) delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch
meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From af4a6e4666264661769e32874e9654e02e5eb019 Mon Sep 17 00:00:00 2001 -From: Alejandro del Castillo <[email protected]> -Date: Thu, 22 Dec 2016 16:15:56 -0600 -Subject: [opkg-utils PATCH] Makefile: use defined bindir and mandir as - installation dirs - -Upstream-Status: Pending - -Signed-off-by: Alejandro del Castillo <[email protected]> ---- - Makefile | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 92b45f1..9f0531c 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,9 +5,6 @@ UTILS = opkg-build opkg-unbuild opkg-make-index opkg.py opkg-list-fields \ - MANPAGES = opkg-build.1 - - DESTDIR= --PREFIX=/usr/local --bindir=$(PREFIX)/bin --mandir=$(PREFIX)/man - - .SUFFIXES: .1 - --- -2.7.4 -
meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch deleted +0 -26
@@ -1,26 +0,0 @@ -Subject: update-alternatives: warn when multiple providers have the same priority - -Upstream-Status: Pending - -Signed-off-by: Chen Qi <[email protected]> ---- - update-alternatives | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/update-alternatives b/update-alternatives -index ca01d5d..ffad853 100644 ---- a/update-alternatives -+++ b/update-alternatives -@@ -90,6 +90,9 @@ add_alt() { - local path="$2" - local priority="$3" - remove_alt $name $path -+ if grep -qw "$priority" $ad/$name; then -+ echo "Warn: update-alternatives: $name has multiple providers with the same priority, please check $ad/$name for details" -+ fi - echo "$path $priority" >> $ad/$name - } - --- -2.8.3 -
Signature · 1 line
2.1.4
PATCH 9/11 gstreamer1.0-omx: Remove unused patch
In reply to Jussi KukkonenThe patch was only used in the ancient and recently removed git recipe.
--- .../0001-omx-fixed-type-error-in-printf-call.patch | 30 ---------------------- 1 file changed, 30 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-omx-fixed-type-error-in-printf-call.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-omx-fixed-type-error-in-printf-call.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From f629e041e9f678fcd86ad764a15117dff63c271c Mon Sep 17 00:00:00 2001 -From: Carlos Rafael Giani <[email protected]> -Date: Sat, 27 Apr 2013 02:50:25 +0200 -Subject: [PATCH] omx: fixed type error in printf call - -%zu expects size_t - -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=699008] - -Signed-off-by: Carlos Rafael Giani <[email protected]> ---- - omx/gstomx.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/omx/gstomx.c b/omx/gstomx.c -index a2945ed..1eca7cc 100644 ---- a/omx/gstomx.c -+++ b/omx/gstomx.c -@@ -1630,7 +1630,7 @@ gst_omx_port_allocate_buffers_unlocked (GstOMXPort * port, - - GST_INFO_OBJECT (comp->parent, - "Allocating %d buffers of size %zu for %s port %u", n, -- port->port_def.nBufferSize, comp->name, (guint) port->index); -+ (size_t) (port->port_def.nBufferSize), comp->name, (guint) port->index); - - if (!port->buffers) - port->buffers = g_ptr_array_sized_new (n); --- -1.7.9.5 -
Signature · 1 line
2.1.4
PATCH 10/11 gstreamer1.0-vaapi: Remove unused patch
In reply to Jussi KukkonenThis patch has seemingly never been applied in the recipe (even when it lived in meta-intel). I don't think we should have unused patches in the repo: If the patch is useful it could be reintroduced so that the binaries are packaged into a separate package.
--- .../gstreamer1.0-vaapi/install-tests.patch | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/install-tests.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/install-tests.patch deleted +0 -43
@@ -1,43 +0,0 @@ -From 2791dfde0de0abe8100fa833dfe1a9c2e74c2629 Mon Sep 17 00:00:00 2001 -From: Jianxun Zhang <[email protected]> -Date: Thu, 21 Jan 2016 16:25:44 -0800 -Subject: [PATCH] Install tests - -This patch is updated for 0.6.1 - -Upstream-Status: Inappropriate - -Signed-off-by: Jianxun Zhang <[email protected]> ---- - tests/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 3637d92..7cc6a97 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,4 +1,4 @@ --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - simple-decoder \ - test-decode \ - test-display \ -@@ -9,13 +9,13 @@ noinst_PROGRAMS = \ - $(NULL) - - if USE_ENCODERS --noinst_PROGRAMS += \ -+bin_PROGRAMS += \ - simple-encoder \ - $(NULL) - endif - - if USE_GLX --noinst_PROGRAMS += \ -+bin_PROGRAMS += \ - test-textures \ - $(NULL) - endif --- -1.9.1 -
Signature · 1 line
2.1.4
PATCH 11/11 kexec-tools: Remove unused patch
In reply to Jussi KukkonenThe patch was removed from SRC_URI as merged upstream in 587778e24c9.
--- .../kexec/kexec-tools/kexec-x32.patch | 88 ---------------------- 1 file changed, 88 deletions(-) delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch
meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch deleted +0 -88
@@ -1,88 +0,0 @@ -x86_64: Add support to build kexec-tools with x32 ABI - -Summary of changes, - -configure.ac: Add test for detect x32 ABI. -purgatory/arch/x86_64/Makefile: Not use mcmodel large when - x32 ABI is set. -kexec/arch/x86_64/kexec-elf-rel-x86_64.c: When x32 ABI is set - use ELFCLASS32 instead of ELFCLASS64. -kexec/kexec-syscall.h: Add correct syscall number for x32 ABI. - -Upstream-Status: Submitted - -Signed-off-by: Aníbal Limón <[email protected]> -Signed-off-by: Mariano Lopez <[email protected]> - ---- - configure.ac | 9 +++++++++ - kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 4 ++++ - kexec/kexec-syscall.h | 4 ++++ - purgatory/arch/x86_64/Makefile | 4 +++- - 4 files changed, 20 insertions(+), 1 deletion(-) - -Index: kexec-tools-2.0.10/configure.ac -=================================================================== ---- kexec-tools-2.0.10.orig/configure.ac -+++ kexec-tools-2.0.10/configure.ac -@@ -56,6 +56,15 @@ case $target_cpu in - ;; - ia64|x86_64|alpha|m68k ) - ARCH="$target_cpu" -+ -+ dnl ---Test for x32 ABI in x86_64 -+ if test "x$ARCH" = "xx86_64" ; then -+ AC_EGREP_CPP(x32_test, -+ [#if defined(__x86_64__) && defined (__ILP32__) -+ x32_test -+ #endif -+ ], SUBARCH='x32', SUBARCH='64') -+ fi - ;; - * ) - AC_MSG_ERROR([unsupported architecture $target_cpu]) -Index: kexec-tools-2.0.10/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -=================================================================== ---- kexec-tools-2.0.10.orig/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -+++ kexec-tools-2.0.10/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -@@ -8,7 +8,11 @@ int machine_verify_elf_rel(struct mem_eh - if (ehdr->ei_data != ELFDATA2LSB) { - return 0; - } -+#ifdef __ILP32__ -+ if (ehdr->ei_class != ELFCLASS32) { -+#else - if (ehdr->ei_class != ELFCLASS64) { -+#endif - return 0; - } - if (ehdr->e_machine != EM_X86_64) { -Index: kexec-tools-2.0.10/kexec/kexec-syscall.h -=================================================================== ---- kexec-tools-2.0.10.orig/kexec/kexec-syscall.h -+++ kexec-tools-2.0.10/kexec/kexec-syscall.h -@@ -31,8 +31,12 @@ - #define __NR_kexec_load 268 - #endif - #ifdef __x86_64__ -+#ifdef __ILP32__ -+#define __NR_kexec_load 528 -+#else - #define __NR_kexec_load 246 - #endif -+#endif - #ifdef __s390x__ - #define __NR_kexec_load 277 - #endif -Index: kexec-tools-2.0.10/purgatory/arch/x86_64/Makefile -=================================================================== ---- kexec-tools-2.0.10.orig/purgatory/arch/x86_64/Makefile -+++ kexec-tools-2.0.10/purgatory/arch/x86_64/Makefile -@@ -23,4 +23,6 @@ x86_64_PURGATORY_SRCS += purgatory/arch/ - x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c - x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c - --x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large -+ifeq ($(SUBARCH),64) -+ x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large -+endif
Signature · 1 line
2.1.4