enable joydev support in epia kernel.

remove obsolete 2.6.5 epia build


BKrev: 416974097RjtJeAG1muafGrbSQL-bg

4 files changed, 2 insertions, 19 deletions

diff --git a/linux/linux-epia-2.6.5/epia_defconfig b/linux/linux-epia-2.6.5/epia_defconfig
deleted file mode 100644
index e69de29bb2..0000000000
--- a/linux/linux-epia-2.6.5/epia_defconfig
+++ /dev/null
diff --git a/linux/linux-epia-2.6.8.1/epia_defconfig b/linux/linux-epia-2.6.8.1/epia_defconfig
index ced4b806a0..a4c9a9bc90 100644
--- a/linux/linux-epia-2.6.8.1/epia_defconfig
+++ b/linux/linux-epia-2.6.8.1/epia_defconfig
@@ -740,7 +740,7 @@ CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_JOYDEV=m
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_EVBUG is not set
diff --git a/linux/linux-epia_2.6.5.oe b/linux/linux-epia_2.6.5.oe
deleted file mode 100644
index d0cad17f52..0000000000
--- a/linux/linux-epia_2.6.5.oe
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Linux kernel for VIA EPiA"
-LICENSE = "GPL"
-
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           file://epia_defconfig"
-S = "${WORKDIR}/linux-${PV}"
-
-COMPATIBLE_HOST = 'i.86.*-linux'
-
-inherit kernel
-
-ARCH = "i386"
-KERNEL_IMAGETYPE = "bzImage"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/epia_defconfig ${S}/.config
-}
diff --git a/linux/linux-epia_2.6.8.1.oe b/linux/linux-epia_2.6.8.1.oe
index 756ef743fc..8bbbf40f1c 100644
--- a/linux/linux-epia_2.6.8.1.oe
+++ b/linux/linux-epia_2.6.8.1.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux kernel for VIA EPiA"
 LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	   http://www.epiawiki.org/files/epia_kernel/patch-2.6.8.1-epia1.bz2;patch=1 \

path: root/meta/recipes-support/libexif/libexif/CVE-2017-7544.patch

From 8a92f964a66d476ca8907234359e92a70fc1325b Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Tue, 28 Aug 2018 15:12:10 +0800
Subject: [PATCH] On saving makernotes, make sure the makernote container tags
 has a type with 1 byte components.

Fixes (at least):
	https://sourceforge.net/p/libexif/bugs/130
	https://sourceforge.net/p/libexif/bugs/129

Upstream-Status: Backport[https://github.com/libexif/libexif/commit/
c39acd1692023b26290778a02a9232c873f9d71a#diff-830e348923810f00726700b083ec00cd]

CVE: CVE-2017-7544

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 libexif/exif-data.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index 67df4db..6bf89eb 100644
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e,
 			exif_mnote_data_set_offset (data->priv->md, *ds - 6);
 			exif_mnote_data_save (data->priv->md, &e->data, &e->size);
 			e->components = e->size;
+                        if (exif_format_get_size (e->format) != 1) {
+				/* e->format is taken from input code,
+				 * but we need to make sure it is a 1 byte
+				 * entity due to the multiplication below. */
+				e->format = EXIF_FORMAT_UNDEFINED;
+			}
 		}
 	}
 
-- 
2.7.4