* [BERNARD 01/17] rpm: fix fprint pointer issue
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 02/17] python: add patch to fix cross compilation on host with linux-3.0 Joshua Lock
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
From: Qing He <qing.he@intel.com>
[YOCTO #1030]
(From OE-Core rev: bc4b86639a713c877dbe5e0f984873915d1578d4)
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../rpm/rpm/fprint-pointer-fix.patch | 35 ++++++++++++++++++++
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 +-
2 files changed, 37 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch
diff --git a/meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch b/meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch
new file mode 100644
index 0000000..87a92eb
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch
@@ -0,0 +1,35 @@
+Upstream-Status: Submitted
+
+From: Qing He <qing.he@intel.com>
+Subject: [PATCH] rpm 5.4.0: Fix pointer mishandling
+
+In fpLookupSubdir, data returned by hash should be of type
+"struct rpmffi_s **" instead of "struct rpmffi_s *" to avoid
+segfault.
+
+Signed-off-by: Qing He <qing.he@intel.com>
+
+diff --git a/rpmdb/fprint.c b/rpmdb/fprint.c
+index 0e76148..82b8f45 100644
+--- a/rpmdb/fprint.c
++++ b/rpmdb/fprint.c
+@@ -333,7 +333,7 @@ restart:
+ *te = '\0';
+
+ while (te < se) {
+- struct rpmffi_s * recs;
++ struct rpmffi_s ** recs;
+ int numRecs;
+ int i;
+
+@@ -346,8 +346,8 @@ restart:
+ const char * link;
+ int fx;
+
+- fx = recs[i].fileno;
+- fi = recs[i].p->fi;
++ fx = recs[i]->fileno;
++ fi = recs[i]->p->fi;
+ flink = fi->flinks[fx];
+ if (!(flink && *flink != '\0'))
+ continue;
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index dd51c9c..24a9268 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPL 2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "bzip2 zlib python perl db openssl elfutils expat libpcre attr acl popt"
-PR = "r15"
+PR = "r16"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -57,6 +57,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://rpm-nofsync.patch \
file://rpm-solvedb.patch \
file://rpm-tools-mtree-LDFLAGS.patch \
+ file://fprint-pointer-fix.patch \
"
# file://hdraddorappend.patch \
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 02/17] python: add patch to fix cross compilation on host with linux-3.0
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
2011-11-03 21:31 ` [BERNARD 01/17] rpm: fix fprint pointer issue Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 03/17] qemu: Poke more paths for presence of libgl Joshua Lock
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
From: Martin Jansa <Martin.Jansa@gmail.com>
(From OE-Core rev: 4b7e7b004dacb698ed637f35661a60d2402c00cd)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../python/python/07-linux3-regen-fix.patch | 18 ++++++++++++++++++
meta/recipes-devtools/python/python_2.6.6.bb | 1 +
2 files changed, 19 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-devtools/python/python/07-linux3-regen-fix.patch
diff --git a/meta/recipes-devtools/python/python/07-linux3-regen-fix.patch b/meta/recipes-devtools/python/python/07-linux3-regen-fix.patch
new file mode 100644
index 0000000..d7fb313
--- /dev/null
+++ b/meta/recipes-devtools/python/python/07-linux3-regen-fix.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Without this patch it calls cross-compiled python if host is running linux-3.0
+python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
+| ./regen: line 3: /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-2.6.6-nk2.8/Python-2.6.6/python: cannot execute binary file
+
+diff -uNr Python-2.6.6.orig//Lib/plat-linux3/regen Python-2.6.6/Lib/plat-linux3/regen
+--- Python-2.6.6.orig//Lib/plat-linux3/regen 1970-01-01 01:00:00.000000000 +0100
++++ Python-2.6.6/Lib/plat-linux3/regen 2001-08-09 14:48:17.000000000 +0200
+@@ -0,0 +1,8 @@
++#! /bin/sh
++case `uname` in
++Linux*) ;;
++*) echo Probably not on a Linux system 1>&2
++ exit 1;;
++esac
++set -v
++h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index 6553c8f..b0438fe 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -15,6 +15,7 @@ SRC_URI = "\
file://05-enable-ctypes-cross-build.patch \
file://06-ctypes-libffi-fix-configure.patch \
file://06-avoid_usr_lib_termcap_path_in_linking.patch \
+ file://07-linux3-regen-fix.patch \
file://99-ignore-optimization-flag.patch \
${DISTRO_SRC_URI} \
"
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 03/17] qemu: Poke more paths for presence of libgl
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
2011-11-03 21:31 ` [BERNARD 01/17] rpm: fix fprint pointer issue Joshua Lock
2011-11-03 21:31 ` [BERNARD 02/17] python: add patch to fix cross compilation on host with linux-3.0 Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 04/17] Magic file path should be given for rpmbuild Joshua Lock
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
From: Khem Raj <raj.khem@gmail.com>
On ubuntu 11.10 libGL is not in
/usr/lib/`uname -i`-linux-gnu/ directory
so we search this dir too.
(From OE-Core rev: ced947e989dfbca8055fe57e14207cb6f1357430)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/qemu/qemu.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 2c6b114..1fb75d9 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -15,6 +15,7 @@ do_configure_prepend_virtclass-native() {
test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
+ test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname -i`-linux-gnu/libGLU.so && libgl='yes'
test -e /usr/lib/pkgconfig/sdl.pc -o -e /usr/lib64/pkgconfig/sdl.pc -o -e /usr/include/SDL/SDL.h && libsdl='yes'
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 04/17] Magic file path should be given for rpmbuild
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (2 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 03/17] qemu: Poke more paths for presence of libgl Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 05/17] qemu: modify search paths for libgl Joshua Lock
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
From: "jani.uusi-rantala@nokia.com" <jani.uusi-rantala@nokia.com>
Magic file path should be given for rpmbuild in
_rpmfc_magic_path define so that build system default file
is not used by accident. Not doing this caused many
packages to fail building in several systems.
Fixes [YOCTO #1358]
Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
---
meta/classes/package_rpm.bbclass | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 70170d1..4f300f8 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -763,6 +763,7 @@ python do_package_rpm () {
targetsys = bb.data.getVar('TARGET_SYS', d, True)
pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d)
pkgarch = bb.data.expand('${PACKAGE_ARCH}', d)
+ magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d)
bb.mkdirhier(pkgwritedir)
os.chmod(pkgwritedir, 0755)
@@ -775,6 +776,7 @@ python do_package_rpm () {
cmd = cmd + " --define '__find_provides " + outprovides + "'"
cmd = cmd + " --define '_unpackaged_files_terminate_build 0'"
cmd = cmd + " --define 'debug_package %{nil}'"
+ cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'"
cmd = cmd + " -bb " + outspecfile
# Build the rpm package!
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 05/17] qemu: modify search paths for libgl
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (3 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 04/17] Magic file path should be given for rpmbuild Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 06/17] scripts/poky-qemu: fix libGL checks for recent Debian(ish) systems Joshua Lock
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
From: Anders Darander <anders@chargestorm.se>
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.
(From OE-Core rev: 32f74152dfe583f005c8654910b15cd7d0e3d421)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/qemu/qemu.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 1fb75d9..c22ebb9 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -15,7 +15,7 @@ do_configure_prepend_virtclass-native() {
test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
- test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname -i`-linux-gnu/libGLU.so && libgl='yes'
+ test -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so && libgl='yes'
test -e /usr/lib/pkgconfig/sdl.pc -o -e /usr/lib64/pkgconfig/sdl.pc -o -e /usr/include/SDL/SDL.h && libsdl='yes'
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 06/17] scripts/poky-qemu: fix libGL checks for recent Debian(ish) systems
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (4 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 05/17] qemu: modify search paths for libgl Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 07/17] libpng: backport security fixes Joshua Lock
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
On 64bit Debian(ish) systems libGL now lives in /usr/lib/x86_64-gnu/, add an
extra test to the qemu script to check for libGL and libGLU in directories
that match this pattern.
Based on commits by Khem Raj (0350be945877b61eb8125663887fd7ed1c3923ab) and
Anders Darander (1927021c78db1a92254785bbc257c00ed2dfcdba) in OE-Core.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
scripts/poky-qemu | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index c76b3ab..b1c3fc6 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -387,6 +387,7 @@ libgl='no'
test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
+test -e /usr/lib/*-linux=gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so && libgl='yes'
if [ "$libgl" != 'yes' ]; then
echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 07/17] libpng: backport security fixes
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (5 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 06/17] scripts/poky-qemu: fix libGL checks for recent Debian(ish) systems Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 08/17] python: fix CVE-2011-1015 Joshua Lock
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
This patch includes various security fixes from upstream (though the patches
were taken from Debian's packaging) to address the following CVE issues:
libpng CVE-2011-2690
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-2690
libpng CVE-2011-2692
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-2692
libpng CVE-2011-2501
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-2501
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../libpng/libpng/02-CVE-2011-2501.patch | 29 +++++++++++++++
.../libpng/libpng/03-CVE-2011-2690.patch | 38 ++++++++++++++++++++
.../libpng/libpng/04-CVE-2011-2692.patch | 29 +++++++++++++++
meta/recipes-multimedia/libpng/libpng_1.2.44.bb | 7 +++-
4 files changed, 101 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-multimedia/libpng/libpng/02-CVE-2011-2501.patch
create mode 100644 meta/recipes-multimedia/libpng/libpng/03-CVE-2011-2690.patch
create mode 100644 meta/recipes-multimedia/libpng/libpng/04-CVE-2011-2692.patch
diff --git a/meta/recipes-multimedia/libpng/libpng/02-CVE-2011-2501.patch b/meta/recipes-multimedia/libpng/libpng/02-CVE-2011-2501.patch
new file mode 100644
index 0000000..c4f98c6
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng/02-CVE-2011-2501.patch
@@ -0,0 +1,29 @@
+This patch is taken from upstream and is a fix for CVE CVE-2011-2501
+
+Description: fix denial of service via error message data
+Origin: upstream, http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=commitdiff;h=65e6d5a34f49acdb362a0625a706c6b914e670af
+
+Upstream-Status: Backport
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+Index: libpng-1.2.44/pngerror.c
+===================================================================
+--- libpng-1.2.44.orig/pngerror.c 2011-07-26 08:18:20.769498103 -0400
++++ libpng-1.2.44/pngerror.c 2011-07-26 08:18:32.819498098 -0400
+@@ -181,8 +181,13 @@
+ {
+ buffer[iout++] = ':';
+ buffer[iout++] = ' ';
+- png_memcpy(buffer + iout, error_message, PNG_MAX_ERROR_TEXT);
+- buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0';
++
++ iin = 0;
++ while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')
++ buffer[iout++] = error_message[iin++];
++
++ /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */
++ buffer[iout] = '\0';
+ }
+ }
+
diff --git a/meta/recipes-multimedia/libpng/libpng/03-CVE-2011-2690.patch b/meta/recipes-multimedia/libpng/libpng/03-CVE-2011-2690.patch
new file mode 100644
index 0000000..f38a222
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng/03-CVE-2011-2690.patch
@@ -0,0 +1,38 @@
+This patch is taken from upstream and is a fix for CVE CVE-2011-2690
+
+Description: fix denial of service and possible arbitrary code
+ execution via crafted PNG image
+Origin: upstream, http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=commit;h=d572394c2a018ef22e9685ac189f5f05c08ea6f5
+
+Upstream-Status: Backport
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+Index: libpng-1.2.44/pngrtran.c
+===================================================================
+--- libpng-1.2.44.orig/pngrtran.c 2011-07-26 08:18:55.489498092 -0400
++++ libpng-1.2.44/pngrtran.c 2011-07-26 08:19:02.079498092 -0400
+@@ -676,10 +676,21 @@
+ png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,
+ double green)
+ {
+- int red_fixed = (int)((float)red*100000.0 + 0.5);
+- int green_fixed = (int)((float)green*100000.0 + 0.5);
++ int red_fixed, green_fixed;
+ if (png_ptr == NULL)
+ return;
++ if (red > 21474.83647 || red < -21474.83648 ||
++ green > 21474.83647 || green < -21474.83648)
++ {
++ png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");
++ red_fixed = -1;
++ green_fixed = -1;
++ }
++ else
++ {
++ red_fixed = (int)((float)red*100000.0 + 0.5);
++ green_fixed = (int)((float)green*100000.0 + 0.5);
++ }
+ png_set_rgb_to_gray_fixed(png_ptr, error_action, red_fixed, green_fixed);
+ }
+ #endif
diff --git a/meta/recipes-multimedia/libpng/libpng/04-CVE-2011-2692.patch b/meta/recipes-multimedia/libpng/libpng/04-CVE-2011-2692.patch
new file mode 100644
index 0000000..5a0f51e
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng/04-CVE-2011-2692.patch
@@ -0,0 +1,29 @@
+This patch is taken from upstream and is a fix for CVE CVE-2011-2962
+
+Description: fix denial of service and possible arbitrary code
+ execution via invalid sCAL chunks
+Origin: upstream, http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=commit;h=61a2d8a2a7b03023e63eae9a3e64607aaaa6d339
+
+Upstream-Status: Backport
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+Index: libpng-1.2.44/pngrutil.c
+===================================================================
+--- libpng-1.2.44.orig/pngrutil.c 2011-07-26 08:19:22.619498085 -0400
++++ libpng-1.2.44/pngrutil.c 2011-07-26 08:19:26.909498086 -0400
+@@ -1812,6 +1812,14 @@
+ return;
+ }
+
++ /* Need unit type, width, \0, height: minimum 4 bytes */
++ else if (length < 4)
++ {
++ png_warning(png_ptr, "sCAL chunk too short");
++ png_crc_finish(png_ptr, length);
++ return;
++ }
++
+ png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)",
+ length + 1);
+ png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.44.bb b/meta/recipes-multimedia/libpng/libpng_1.2.44.bb
index 4a8d5c3..58c20f0 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.2.44.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.44.bb
@@ -6,9 +6,12 @@ LICENSE = "libpng"
LIC_FILES_CHKSUM = "file://LICENSE;md5=a294a2bb08b7f25558119edbfd6b2e92 \
file://png.h;startline=172;endline=261;md5=3253923f0093658f470e52a06ddcf4e7"
DEPENDS = "zlib"
-PR = "r0"
+PR = "r1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \
+ file://02-CVE-2011-2501.patch \
+ file://03-CVE-2011-2690.patch \
+ file://04-CVE-2011-2692.patch"
SRC_URI[md5sum] = "e3ac7879d62ad166a6f0c7441390d12b"
SRC_URI[sha256sum] = "b9ab20f1c2c3bf6c4448fd9bd8a4a8905b918114d5fada56c97bb758a17b7215"
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 08/17] python: fix CVE-2011-1015
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (6 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 07/17] libpng: backport security fixes Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 09/17] glib-2.0: explicitly disable dtrace and systemtap for native varaint Joshua Lock
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
This patch adds a backported security fix from upstream for CVE-2011-1015 to
address a vulnerability in the CGIHTTPServer module.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../python/python/fix-cgi-http-server.patch | 176 ++++++++++++++++++++
meta/recipes-devtools/python/python_2.6.6.bb | 3 +-
2 files changed, 178 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/python/python/fix-cgi-http-server.patch
diff --git a/meta/recipes-devtools/python/python/fix-cgi-http-server.patch b/meta/recipes-devtools/python/python/fix-cgi-http-server.patch
new file mode 100644
index 0000000..5df0fa5
--- /dev/null
+++ b/meta/recipes-devtools/python/python/fix-cgi-http-server.patch
@@ -0,0 +1,176 @@
+This patch is taken from upstream and is a fix for CVE CVE-2011-1015
+
+Upstream-Status: Backport
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+# HG changeset patch
+# User Gregory P. Smith <greg@mad-scientist.com>
+# Date 1238999606 0
+# Node ID c6c4398293bd682b355f1050bb16bb3e18c8b40f
+# Parent e363958fcd70a43ad07b39df999552d0fa1cefc1
+- Issue #2254: Fix CGIHTTPServer information disclosure. Relative paths are
+ now collapsed within the url properly before looking in cgi_directories.
+
+Index: Python-2.6.6/Lib/CGIHTTPServer.py
+===================================================================
+--- Python-2.6.6.orig/Lib/CGIHTTPServer.py 2009-11-11 09:24:53.000000000 -0800
++++ Python-2.6.6/Lib/CGIHTTPServer.py 2011-10-13 13:51:33.815347721 -0700
+@@ -70,27 +70,20 @@
+ return SimpleHTTPServer.SimpleHTTPRequestHandler.send_head(self)
+
+ def is_cgi(self):
+- """Test whether self.path corresponds to a CGI script,
+- and return a boolean.
++ """Test whether self.path corresponds to a CGI script.
+
+- This function sets self.cgi_info to a tuple (dir, rest)
+- when it returns True, where dir is the directory part before
+- the CGI script name. Note that rest begins with a
+- slash if it is not empty.
+-
+- The default implementation tests whether the path
+- begins with one of the strings in the list
+- self.cgi_directories (and the next character is a '/'
+- or the end of the string).
++ Returns True and updates the cgi_info attribute to the tuple
++ (dir, rest) if self.path requires running a CGI script.
++ Returns False otherwise.
++
++ The default implementation tests whether the normalized url
++ path begins with one of the strings in self.cgi_directories
++ (and the next character is a '/' or the end of the string).
+ """
+-
+- path = self.path
+-
+- for x in self.cgi_directories:
+- i = len(x)
+- if path[:i] == x and (not path[i:] or path[i] == '/'):
+- self.cgi_info = path[:i], path[i+1:]
+- return True
++ splitpath = _url_collapse_path_split(self.path)
++ if splitpath[0] in self.cgi_directories:
++ self.cgi_info = splitpath
++ return True
+ return False
+
+ cgi_directories = ['/cgi-bin', '/htbin']
+@@ -299,6 +292,46 @@
+ self.log_message("CGI script exited OK")
+
+
++# TODO(gregory.p.smith): Move this into an appropriate library.
++def _url_collapse_path_split(path):
++ """
++ Given a URL path, remove extra '/'s and '.' path elements and collapse
++ any '..' references.
++
++ Implements something akin to RFC-2396 5.2 step 6 to parse relative paths.
++
++ Returns: A tuple of (head, tail) where tail is everything after the final /
++ and head is everything before it. Head will always start with a '/' and,
++ if it contains anything else, never have a trailing '/'.
++
++ Raises: IndexError if too many '..' occur within the path.
++ """
++ # Similar to os.path.split(os.path.normpath(path)) but specific to URL
++ # path semantics rather than local operating system semantics.
++ path_parts = []
++ for part in path.split('/'):
++ if part == '.':
++ path_parts.append('')
++ else:
++ path_parts.append(part)
++ # Filter out blank non trailing parts before consuming the '..'.
++ path_parts = [part for part in path_parts[:-1] if part] + path_parts[-1:]
++ if path_parts:
++ tail_part = path_parts.pop()
++ else:
++ tail_part = ''
++ head_parts = []
++ for part in path_parts:
++ if part == '..':
++ head_parts.pop()
++ else:
++ head_parts.append(part)
++ if tail_part and tail_part == '..':
++ head_parts.pop()
++ tail_part = ''
++ return ('/' + '/'.join(head_parts), tail_part)
++
++
+ nobody = None
+
+ def nobody_uid():
+Index: Python-2.6.6/Lib/test/test_httpservers.py
+===================================================================
+--- Python-2.6.6.orig/Lib/test/test_httpservers.py 2010-04-25 15:09:32.000000000 -0700
++++ Python-2.6.6/Lib/test/test_httpservers.py 2011-10-13 13:51:33.815347721 -0700
+@@ -7,6 +7,7 @@
+ from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+ from SimpleHTTPServer import SimpleHTTPRequestHandler
+ from CGIHTTPServer import CGIHTTPRequestHandler
++import CGIHTTPServer
+
+ import os
+ import sys
+@@ -324,6 +325,45 @@
+ finally:
+ BaseTestCase.tearDown(self)
+
++ def test_url_collapse_path_split(self):
++ test_vectors = {
++ '': ('/', ''),
++ '..': IndexError,
++ '/.//..': IndexError,
++ '/': ('/', ''),
++ '//': ('/', ''),
++ '/\\': ('/', '\\'),
++ '/.//': ('/', ''),
++ 'cgi-bin/file1.py': ('/cgi-bin', 'file1.py'),
++ '/cgi-bin/file1.py': ('/cgi-bin', 'file1.py'),
++ 'a': ('/', 'a'),
++ '/a': ('/', 'a'),
++ '//a': ('/', 'a'),
++ './a': ('/', 'a'),
++ './C:/': ('/C:', ''),
++ '/a/b': ('/a', 'b'),
++ '/a/b/': ('/a/b', ''),
++ '/a/b/c/..': ('/a/b', ''),
++ '/a/b/c/../d': ('/a/b', 'd'),
++ '/a/b/c/../d/e/../f': ('/a/b/d', 'f'),
++ '/a/b/c/../d/e/../../f': ('/a/b', 'f'),
++ '/a/b/c/../d/e/.././././..//f': ('/a/b', 'f'),
++ '../a/b/c/../d/e/.././././..//f': IndexError,
++ '/a/b/c/../d/e/../../../f': ('/a', 'f'),
++ '/a/b/c/../d/e/../../../../f': ('/', 'f'),
++ '/a/b/c/../d/e/../../../../../f': IndexError,
++ '/a/b/c/../d/e/../../../../f/..': ('/', ''),
++ }
++ for path, expected in test_vectors.iteritems():
++ if isinstance(expected, type) and issubclass(expected, Exception):
++ self.assertRaises(expected,
++ CGIHTTPServer._url_collapse_path_split, path)
++ else:
++ actual = CGIHTTPServer._url_collapse_path_split(path)
++ self.assertEquals(expected, actual,
++ msg='path = %r\nGot: %r\nWanted: %r' % (
++ path, actual, expected))
++
+ def test_headers_and_content(self):
+ res = self.request('/cgi-bin/file1.py')
+ self.assertEquals(('Hello World\n', 'text/html', 200), \
+@@ -348,6 +388,12 @@
+ self.assertEquals(('Hello World\n', 'text/html', 200), \
+ (res.read(), res.getheader('Content-type'), res.status))
+
++ def test_no_leading_slash(self):
++ # http://bugs.python.org/issue2254
++ res = self.request('cgi-bin/file1.py')
++ self.assertEquals(('Hello World\n', 'text/html', 200),
++ (res.read(), res.getheader('Content-type'), res.status))
++
+
+ def test_main(verbose=None):
+ cwd = os.getcwd()
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index b0438fe..59493f3 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -1,7 +1,7 @@
require python.inc
DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
@@ -17,6 +17,7 @@ SRC_URI = "\
file://06-avoid_usr_lib_termcap_path_in_linking.patch \
file://07-linux3-regen-fix.patch \
file://99-ignore-optimization-flag.patch \
+ file://fix-cgi-http-server.patch \
${DISTRO_SRC_URI} \
"
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 09/17] glib-2.0: explicitly disable dtrace and systemtap for native varaint
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (7 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 08/17] python: fix CVE-2011-1015 Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 10/17] valgrind: supporting on Linux kernel 3.x Joshua Lock
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
This prevents systemtap and dtrace being picked up from the host as
reported on the Yocto mailing list by Andre Haupt <andre@bitwigglers.org>
(From OE-Core rev: 0d883b5df25635fbad45191d297cbdf78a6c1fe0)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Conflicts:
meta/recipes-core/glib-2.0/glib.inc
---
meta/recipes-core/glib-2.0/glib.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 0319b9d..51ccd4d 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -28,7 +28,7 @@ inherit autotools pkgconfig gettext
S = "${WORKDIR}/glib-${PV}"
EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
-EXTRA_OECONF_virtclass-native = ""
+EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap"
EXTRA_OECONF_poky-lsb = "--enable-included-printf=no"
FILES_${PN} = "${libdir}/lib*${SOLIBS}"
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 10/17] valgrind: supporting on Linux kernel 3.x
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (8 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 09/17] glib-2.0: explicitly disable dtrace and systemtap for native varaint Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 11/17] matchbox-wm-2: fix typo in Makefile Joshua Lock
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
From: Lin Tong <tong.lin@intel.com>
The old valgrind package do not support for Linux kernel 3.x, only for
kernel 2.4 and 2.6. Now adding the configuration to the configure.in
file to support Linux kernel 3.0.
This commit fixes the problem in valgrind [YOCTO #1129]
(From OE-Core rev: 5fc1e6d27f52e2032aa7a8ca20bb90d939d03c77)
Signed-off-by: Lin Tong <tong.lin@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Applied to Bernard's valgrind 3.6.0
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../valgrind-3.6.0/fix_unsupporting_kernel_3.patch | 26 ++++++++++++++++++++
meta/recipes-devtools/valgrind/valgrind_3.6.0.bb | 5 ++-
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_unsupporting_kernel_3.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_unsupporting_kernel_3.patch b/meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_unsupporting_kernel_3.patch
new file mode 100644
index 0000000..346ffeb
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_unsupporting_kernel_3.patch
@@ -0,0 +1,26 @@
+valgrind: Add 3.x statements to "case" for supporting the kernel 3.x
+
+Signed-off-by: Lin Tong <tong.lin@intel.com>
+
+Upstream-Status: Pending
+
+diff --git a/configure.in b/configure.in
+index 3878619..1cb7dc7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -229,10 +229,14 @@ case "${host_os}" in
+ AC_MSG_RESULT([2.4 family (${kernel})])
+ AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you're using Linux 2.4.x])
+ ;;
++ 3.*)
++ AC_MSG_RESULT([3 family (${kernel})])
++ AC_DEFINE([KERNEL_3], 1, [Define to 1 if you're using Linux 3.x])
++ ;;
+
+ *)
+ AC_MSG_RESULT([unsupported (${kernel})])
+- AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6])
++ AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6, 3.x])
+ ;;
+ esac
+
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb
index a33a540..066c16d 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
file://include/valgrind.h;beginline=1;endline=56;md5=13a71cedba99112334d8596162aec37e \
file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
DEPENDS = "virtual/libx11"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
file://fix_issue_caused_by_ccache.patch \
- file://fixed-perl-path.patch"
+ file://fixed-perl-path.patch \
+ file://fix_unsupporting_kernel_3.patch"
SRC_URI[md5sum] = "b289c5f4ab8e39741602445f1dd09b34"
SRC_URI[sha256sum] = "bc0f0153b5a47b986f1d8efa2c488e0aea85a1cf2c4b11c52be127903080285f"
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 11/17] matchbox-wm-2: fix typo in Makefile
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (9 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 10/17] valgrind: supporting on Linux kernel 3.x Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 12/17] zaurusd: fix a " Joshua Lock
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
From: Nitin A Kamble <nitin.a.kamble@intel.com>
(From OE-Core rev: a708c42065eeeaabf97b97b530f63e4ef484bcf7)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../matchbox-wm-2/matchbox-wm-2/fix_makefile.patch | 19 +++++++++++++++++++
.../matchbox-wm-2/matchbox-wm-2_svn.bb | 3 ++-
2 files changed, 21 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
new file mode 100644
index 0000000..8c40e85
--- /dev/null
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
@@ -0,0 +1,19 @@
+Upstream-Status: Pending
+
+Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10
+Fix following build error:
+| Makefile:734: *** missing separator (did you mean TAB instead of 8 spaces?). Stop.
+| ERROR: oe_runmake failed
+
+Index: matchbox-window-manager-2/Makefile.am
+===================================================================
+--- matchbox-window-manager-2.orig/Makefile.am
++++ matchbox-window-manager-2/Makefile.am
+@@ -3,6 +3,6 @@ SUBDIRS = matchbox data doc util
+ # Extra clean files so that maintainer-clean removes *everything*
+
+ snapshot:
+- $(MAKE) dist distdir=$(PACKAGE)-snapshot-`date +"%Y%m%d"`
++ $(MAKE) dist distdir=$(PACKAGE)-snapshot-`date +"%Y%m%d"`
+
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb
index 2eb12e1..786406d 100644
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb
@@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://matchbox/core/mb-wm.h;endline=21;md5=1b1d328a52790635
DEPENDS = "virtual/libx11 libxext libxrender startup-notification expat gconf pango libxdamage libxcomposite gtk+"
PV = "0.0+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager-2;proto=http \
+ file://fix_makefile.patch \
"
S = "${WORKDIR}/matchbox-window-manager-2"
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 12/17] zaurusd: fix a typo in Makefile
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (10 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 11/17] matchbox-wm-2: fix typo in Makefile Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 13/17] Remove help2man dependency Joshua Lock
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
From: Nitin A Kamble <nitin.a.kamble@intel.com>
(From OE-Core rev: fcc7800834fda37df5a5c2bbd1da712ec8ff12b9)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../recipes-bsp/zaurusd/zaurusd/fix_makefile.patch | 19 +++++++++++++++++++
meta/recipes-bsp/zaurusd/zaurusd_svn.bb | 5 +++--
2 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch
diff --git a/meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch b/meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch
new file mode 100644
index 0000000..9b28202
--- /dev/null
+++ b/meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch
@@ -0,0 +1,19 @@
+Upstream-Status: Pending
+
+Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10
+Fix following build error:
+
+| Makefile:716: *** missing separator (did you mean TAB instead of 8 spaces?). Stop.
+| ERROR: oe_runmake failed
+
+Index: zaurusd/Makefile.am
+===================================================================
+--- zaurusd.orig/Makefile.am
++++ zaurusd/Makefile.am
+@@ -4,5 +4,5 @@ SUBDIRS = apps config scripts
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
+
+ snapshot:
+- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
diff --git a/meta/recipes-bsp/zaurusd/zaurusd_svn.bb b/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
index 455a29f..556d158 100644
--- a/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
+++ b/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
@@ -5,9 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "tslib"
RDEPENDS_${PN} = "xrandr"
PV = "0.0+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
+ file://fix_makefile.patch"
S = "${WORKDIR}/${PN}"
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 13/17] Remove help2man dependency
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (11 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 12/17] zaurusd: fix a " Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 14/17] texinfo: several changes to build without zlib and ncurses headers on host Joshua Lock
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
From: Richard Purdie <richard.purdie@linuxfoundation.org>
The help2man script is pretty useless to us. It requires to run the target
binary to extract help information which is not possible for any of our
cross compiled target binaries.
We're not interested in man pages for -cross/-native tools.
It therefore makes no sense to have this as a core build dependency.
This patch removes the dependeny and replaces it with a script
returning false. This will trigger autotool's missing utility
to use the copy of the man page included with the sources which
is what would already happen when we tried to run cross compiled
binaries anyway.
(From OE-Core rev: 288343e30604b944dc18fd82172febd314d9c520)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
scripts/help2man | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
create mode 100755 scripts/help2man
diff --git a/scripts/help2man b/scripts/help2man
new file mode 100755
index 0000000..2bb8d86
--- /dev/null
+++ b/scripts/help2man
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 1
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 14/17] texinfo: several changes to build without zlib and ncurses headers on host
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (12 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 13/17] Remove help2man dependency Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 15/17] web: switch to git Joshua Lock
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
Texinfo very cleverly detects cross-compilation and builds host versions
of the texinfo binaries it requires to bootstrap the build, however this
was causing the host to require ncurses and zlib libraries and headers.
Instead, since we require texinfo to be installed on the host, remove this
feature from the texinfo configure.ac (disable-native-tools.patch).
Further, fix texinfo to link with newer binutils (link-zip.patch) and to
generate translations with newer gettext (gettext-macros.patch).
With this patch I am able to build texinfo on Fedora without ncurses-devel
and zlib-devel installed.
This fixes [YOCTO #1483]
(From OE-Core rev: 4b395a9beb6c02f7b23266e7ee2ca3c08a9cbb70)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Conflicts:
meta/recipes-extended/texinfo/texinfo_4.13a.bb
---
.../texinfo-4.13a/disable-native-tools.patch | 43 ++++++++++++++++++++
.../texinfo/texinfo-4.13a/link-zip.patch | 16 +++++++
meta/recipes-extended/texinfo/texinfo_4.13a.bb | 23 +++++-----
3 files changed, 70 insertions(+), 12 deletions(-)
create mode 100644 meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch
create mode 100644 meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch
new file mode 100644
index 0000000..ab6f165
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch
@@ -0,0 +1,43 @@
+We already DEPEND on the native texinfo being present before building so
+there isn't any need to try and build the required native texinfo binaries
+before cross-compiling. This simplifies the recipe somewhat!
+
+Upstream-Status: Inappropriate oe specific
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+Index: texinfo-4.13/configure.ac
+===================================================================
+--- texinfo-4.13.orig/configure.ac
++++ texinfo-4.13/configure.ac
+@@ -100,29 +100,7 @@ AC_CANONICAL_BUILD
+ # $native_tools is also added to SUBDIRS in the main Makefile.am,
+ # so that make compiles the native tools first.
+ #
+-if test "$cross_compiling" = no; then
+- native_tools=
+-else
+- native_tools=tools
+- test -d "$native_tools" || mkdir "$native_tools"
+- confdir=`(cd "$srcdir";pwd)`
+- # Make sure the secondary configure won't fail with
+- # "error: source directory already configured".
+- rm -f config.status
+- AC_MSG_NOTICE([[Doing configure of native tools (${build}).]])
+- cd "$native_tools" || exit 1
+- # Run secondary configure in alternate environment or
+- # it gets the wrong CC etc.
+- # env -i gives this build host configure a clean environment;
+- # consequently, we have to re-initialize $PATH.
+- env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \
+- PATH="$PATH" \
+- tools_only=1 \
+- ${confdir}/configure --build=${build} --host=${build} \
+- --disable-rpath --disable-nls
+- cd .. || exit 1
+- AC_MSG_NOTICE([[Continuing with main configure (${host}).]])
+-fi
++native_tools=
+ AC_SUBST(native_tools)
+ AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
+
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch
new file mode 100644
index 0000000..629d329
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch
@@ -0,0 +1,16 @@
+install-info uses symbols from zlib so must link against it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+Index: texinfo-4.13/install-info/Makefile.am
+===================================================================
+--- texinfo-4.13.orig/install-info/Makefile.am
++++ texinfo-4.13/install-info/Makefile.am
+@@ -28,4 +28,4 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/gnulib/lib \
+ -I$(top_builddir)/gnulib/lib \
+ -DLOCALEDIR=\"$(localedir)\"
+-LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
++LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -lz
diff --git a/meta/recipes-extended/texinfo/texinfo_4.13a.bb b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
index ac89b66..5fd2d31 100644
--- a/meta/recipes-extended/texinfo/texinfo_4.13a.bb
+++ b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
@@ -9,14 +9,17 @@ LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010"
PR = "r0"
-DEPENDS = "zlib"
+DEPENDS = "zlib ncurses texinfo-native"
+DEPENDS_virtclass-native = "zlib-native ncurses-native"
SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \
- file://texinfo-4.12-zlib.patch;striplevel=1 \
- file://texinfo-4.13a-data_types.patch;striplevel=1 \
- file://texinfo-4.13a-mosdo-crash.patch;striplevel=1 \
- file://texinfo-4.13a-powerpc.patch;striplevel=1 \
- file://texinfo-4.13a-help-index-segfault.patch;striplevel=1"
+ file://texinfo-4.12-zlib.patch \
+ file://texinfo-4.13a-data_types.patch \
+ file://texinfo-4.13a-mosdo-crash.patch \
+ file://texinfo-4.13a-powerpc.patch \
+ file://texinfo-4.13a-help-index-segfault.patch \
+ file://disable-native-tools.patch \
+ file://link-zip.patch"
SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb"
SRC_URI[sha256sum] = "1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68"
@@ -26,13 +29,9 @@ tex_texinfo = "texmf/tex/texinfo"
inherit gettext autotools
-do_configure() {
- oe_runconf
-}
-
-do_compile_prepend(){
+do_compile_prepend() {
if [ -d tools ];then
- make -C tools/gnulib/lib
+ oe_runmake -C tools/gnulib/lib
fi
}
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 15/17] web: switch to git
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (13 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 14/17] texinfo: several changes to build without zlib and ncurses headers on host Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 16/17] linux-yocto-stable: update SRC_URI to generic 2.6.34 repo Joshua Lock
2011-11-03 21:31 ` [BERNARD 17/17] linux-yocto-stable: update SRCREVs to v2.6.34.10 Joshua Lock
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
The SVN repo is no longer available and we don't have a mirror of the
SVN tarball.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../conf/distro/include/poky-default-revisions.inc | 2 +-
meta/recipes-sato/web/{web_svn.bb => web_git.bb} | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
rename meta/recipes-sato/web/{web_svn.bb => web_git.bb} (75%)
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 20f54d9..0521fe5 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -180,7 +180,7 @@ SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
SRCREV_pn-ubootchart ??= "10"
SRCREV_pn-webkit-gtk ??= "72836"
SRCREV_pn-web-webkit ??= "130"
-SRCREV_pn-web ??= "131"
+SRCREV_pn-web ??= "8adaf105a0cbfd835ea5d3915d7dee22586208e7"
SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
SRCREV_pn-xcb-proto-native ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
SRCREV_pn-xf86-video-intel ??= "87ea531c5dc5b39809395b277c330854aaaaf019"
diff --git a/meta/recipes-sato/web/web_svn.bb b/meta/recipes-sato/web/web_git.bb
similarity index 75%
rename from meta/recipes-sato/web/web_svn.bb
rename to meta/recipes-sato/web/web_git.bb
index bdcdaba..0432842 100644
--- a/meta/recipes-sato/web/web_svn.bb
+++ b/meta/recipes-sato/web/web_git.bb
@@ -4,15 +4,16 @@ DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl"
DESCRIPTION = "Web is a multi-platform web browsing application."
PR = "r4"
-PV = "0.0+svnr${SRCPV}"
+PV = "0.0+git${SRCPV}"
-SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
+SRC_URI = "git://git.yoctoproject.org/web-sato;protocol=git \
file://owl-window-menu.patch \
+ file://makefile-whitespace.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-S = "${WORKDIR}/trunk"
+S = "${WORKDIR}/git"
do_unpack_append () {
bb.build.exec_func('do_remove_patches', d)
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 16/17] linux-yocto-stable: update SRC_URI to generic 2.6.34 repo
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (14 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 15/17] web: switch to git Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
2011-11-03 21:31 ` [BERNARD 17/17] linux-yocto-stable: update SRCREVs to v2.6.34.10 Joshua Lock
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
From: Bruce Ashfield <bruce.ashfield@windriver.com>
The existing linux-windriver repo was cloned into a more generically
named linux-yocto-2.6.34 repository. It is the 2.6.34 repository that
is taking updates for stable and point releases, so switching the
SRC_URI to that repo needs to be done. The existing repository is
maintained for old releases and builds, so nothing is lost.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
.../recipes-kernel/linux/linux-yocto-stable_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb
index 3c1e669..f3a02dc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb
@@ -32,7 +32,7 @@ python __anonymous () {
bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d)
}
-SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta"
+SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.34;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta"
# Functionality flags
KERNEL_REVISION_CHECKING ?= "t"
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread* [BERNARD 17/17] linux-yocto-stable: update SRCREVs to v2.6.34.10
2011-11-03 21:31 [BERNARD 00/17] Bernard stable updates Joshua Lock
` (15 preceding siblings ...)
2011-11-03 21:31 ` [BERNARD 16/17] linux-yocto-stable: update SRC_URI to generic 2.6.34 repo Joshua Lock
@ 2011-11-03 21:31 ` Joshua Lock
16 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-11-03 21:31 UTC (permalink / raw)
To: poky
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Updating the SRCREVs to pick up the -longterm updates to v2.6.34.10
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
.../conf/distro/include/poky-default-revisions.inc | 22 ++++++++++----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 0521fe5..ddd5a36 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -86,17 +86,17 @@ SRCREV_pn-linux-omap-zoomsync ??= "015cbaf1035cd9a61d33a27de2a22902555db3c5"
SRCREV_pn-linux-omap2 ??= "d3b3ae0fe6c71641da19c8de466ec366d39847e3"
SRCREV_pn-linux-omap3 ??= "de1121fdb899f762b9e717f44eaf3fae7c00cd3e"
SRCREV_pn-linux-omap3-pm ??= "totallybroken"
-SRCREV_machine_pn-linux-yocto-stable_qemuarm ?= "a2fb081b44d6368eff8d28e2fdb991c61b1f428e"
-SRCREV_machine_pn-linux-yocto-stable_qemumips ?= "c32d40f960e3c89d07f079bec4c96dcbfc749f0b"
-SRCREV_machine_pn-linux-yocto-stable_qemuppc ?= "96d6bc31d3caaf62a966255479cc5cee0e76b1e9"
-SRCREV_machine_pn-linux-yocto-stable_qemux86 ?= "72ca49ab08b8eb475cec82a10049503602325791"
-SRCREV_machine_pn-linux-yocto-stable_qemux86-64 ?= "72ca49ab08b8eb475cec82a10049503602325791"
-SRCREV_machine_pn-linux-yocto-stable_atom-pc ?= "72ca49ab08b8eb475cec82a10049503602325791"
-SRCREV_machine_pn-linux-yocto-stable_routerstationpro ?= "49745cd45c92a89e70c6e2334caa80818c134562"
-SRCREV_machine_pn-linux-yocto-stable_mpc8315e-rdb ?= "a1c0ed6bf4060c10874b2a8547d81b3169dcf16a"
-SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "ef7f944e773950d4016b7643f9ecf052bbe250cd"
-SRCREV_machine_pn-linux-yocto-stable ?= "72ca49ab08b8eb475cec82a10049503602325791"
-SRCREV_meta_pn-linux-yocto-stable ?= "e1f85a470934a0cf6abde5d95533e74501822c6b"
+SRCREV_machine_pn-linux-yocto-stable_qemuarm ?= "24305dfe5a7c4eadb0160b565442991c2a4598e6"
+SRCREV_machine_pn-linux-yocto-stable_qemumips ?= "872453662305b0c14cc87480f7c96168ff36481e"
+SRCREV_machine_pn-linux-yocto-stable_qemuppc ?= "11affb88242d373b5bf4039b771e3872b428e3d2"
+SRCREV_machine_pn-linux-yocto-stable_qemux86 ?= "adea8c9cce0ffff0f10abe3257382c1190f0f569"
+SRCREV_machine_pn-linux-yocto-stable_qemux86-64 ?= "adea8c9cce0ffff0f10abe3257382c1190f0f569"
+SRCREV_machine_pn-linux-yocto-stable_atom-pc ?= "adea8c9cce0ffff0f10abe3257382c1190f0f569"
+SRCREV_machine_pn-linux-yocto-stable_routerstationpro ?= "4e8cefebccb235de37199a7644a89ead1fc0b2fa"
+SRCREV_machine_pn-linux-yocto-stable_mpc8315e-rdb ?= "9bf8e1497b853a5d556e94febf8185c380e6a2d3"
+SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "f3e11c02c4d62d9a3c00abd2048c0b6cf007d988"
+SRCREV_machine_pn-linux-yocto-stable ?= "adea8c9cce0ffff0f10abe3257382c1190f0f569"
+SRCREV_meta_pn-linux-yocto-stable ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
# development SRCREVs
SRCREV_machine_pn-linux-yocto_qemuarm ?= "233213a1e09eae3de7047ff406b156608788ec17"
SRCREV_machine_pn-linux-yocto_qemumips ?= "54bb956f70349923af29f28a4f9471f5658e1787"
--
1.7.7
^ permalink raw reply related [flat|nested] 18+ messages in thread