summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2014-01-13 12:41:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-14 11:33:55 +0000
commit90e8429de68ca288e9a6554e7d6e8ac1473334e7 (patch)
tree7632935fa39f0dfc63f31d9302dec2b5ecbd820c /meta
parenta90fb7b7329d8fdda53dc573349f1fc06b093c13 (diff)
downloadpoky-90e8429de68ca288e9a6554e7d6e8ac1473334e7.tar.gz
libproxy: Update to 0.4.11
Delete patches that have been applied upstream or are no longer necessary. Update LIC_FILES_CHKSUM to match new COPYING (whitespace changes only). (From OE-Core rev: 7c3b070b9cdd8b1d564d8900858cd31d11b20e6f) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libproxy/libproxy/g++-namepace.patch22
-rw-r--r--meta/recipes-support/libproxy/libproxy/libproxy-0.4.7-CVE-2012-4504.patch29
-rw-r--r--meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch30
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.11.bb (renamed from meta/recipes-support/libproxy/libproxy_0.4.7.bb)11
4 files changed, 3 insertions, 89 deletions
diff --git a/meta/recipes-support/libproxy/libproxy/g++-namepace.patch b/meta/recipes-support/libproxy/libproxy/g++-namepace.patch
deleted file mode 100644
index cb90ab704e..0000000000
--- a/meta/recipes-support/libproxy/libproxy/g++-namepace.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1include unistd.h to get prototypes of close() and read()
2otherwise g++ complains
3
4libproxy/url.cpp:439:13: error: 'close' was not declared in this scope
5libproxy/url.cpp:398:37: error: 'read' was not declared in this scope
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Upstream-Status: Pending
10
11Index: libproxy-0.4.7/libproxy/url.cpp
12===================================================================
13--- libproxy-0.4.7.orig/libproxy/url.cpp 2012-03-01 09:51:11.254156247 -0800
14+++ libproxy-0.4.7/libproxy/url.cpp 2012-03-01 09:56:12.058171256 -0800
15@@ -33,6 +33,7 @@
16 #include <cstdlib> // For atoi()
17 #include <sys/stat.h> // For stat()
18 #include <algorithm> // For transform()
19+#include <unistd.h> // For close(), read()
20
21 #ifdef WIN32
22 #include <io.h>
diff --git a/meta/recipes-support/libproxy/libproxy/libproxy-0.4.7-CVE-2012-4504.patch b/meta/recipes-support/libproxy/libproxy/libproxy-0.4.7-CVE-2012-4504.patch
deleted file mode 100644
index 7f2d93a937..0000000000
--- a/meta/recipes-support/libproxy/libproxy/libproxy-0.4.7-CVE-2012-4504.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Backport
2
3libproxy - CVE-2012-4504:
4
5Reference:https://code.google.com/p/libproxy/source/detail?r=853
6
7Stack-based buffer overflow in the url::get_pac function in url.cpp
8in libproxy 0.4.x before 0.4.9 allows remote servers to have an
9unspecified impact via a large proxy.pac file.
10
11http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-4504
12
13Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com>
14
15diff -urpN a/libproxy/url.cpp b/libproxy/url.cpp
16--- a/libproxy/url.cpp 2012-11-26 10:08:47.000000000 +0800
17+++ b/libproxy/url.cpp 2012-11-26 10:05:54.000000000 +0800
18@@ -472,9 +472,10 @@ char* url::get_pac() {
19 // Add this chunk to our content length,
20 // ensuring that we aren't over our max size
21 content_length += chunk_length;
22- if (content_length >= PAC_MAX_SIZE) break;
23 }
24
25+ if (content_length >= PAC_MAX_SIZE) break;
26+
27 while (recvd != content_length) {
28 int r = recv(sock, buffer + recvd, content_length - recvd, 0);
29 if (r < 0) break;
diff --git a/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch b/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
deleted file mode 100644
index a772f09e87..0000000000
--- a/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Upstream-Status: Pending
2
3Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
42012/04/20
5Fixes this issue with gcc 4.7
6
7| cd /srv/home/nitin/builds/bERROR: Function failed: do_compile (see /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/temp/log.do_compile.7514 for further information)
8| uild-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy && /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/bin/x86_64-poky-linux/x86_64-poky-linux-g++ -Dlibproxy_EXPORTS -D_POSIX_C_SOURCE=1 -DLIBEXECDIR=\"/usr/libexec\" -DMM_MODULE_BUILTIN=config_sysconfig -fvisibility=hidden -m64 --sysroot=/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64 -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -fpermissive -O2 -g -fPIC -I/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7 -I/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64/usr/include/glib-2.0 -I/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64/usr/lib/glib-2.0/include -o CMakeFiles/libproxy.dir/modules/config_sysconfig.cpp.o -c /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
9| /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp: In function 'bool should_use_sysconfig()':
10| /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp:107:18: error: 'getuid' was not declared in this scope
11| make[2]: *** [libproxy/CMakeFiles/libproxy.dir/modules/config_sysconfig.cpp.o] Error 1
12| make[2]: Leaving directory `/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7'
13| make[1]: *** [libproxy/CMakeFiles/libproxy.dir/all] Error 2
14| make[1]: Leaving directory `/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7'
15| make: *** [all] Error 2
16| ERROR: oe_runmake failed
17NOTE: package libproxy-0.4.7-r3: task do_compile: Failed
18
19Index: libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
20===================================================================
21--- libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp
22+++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
23@@ -21,6 +21,7 @@
24 #include <cstdlib>
25 #include <map>
26 #include <fstream>
27+#include <unistd.h>
28
29 #include "../extension_config.hpp"
30 using namespace libproxy;
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.7.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
index 3838cb880d..aecb7b5a82 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.7.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
@@ -3,21 +3,16 @@ HOMEPAGE = "http://code.google.com/p/libproxy/"
3BUGTRACKER = "http://code.google.com/p/libproxy/issues/list" 3BUGTRACKER = "http://code.google.com/p/libproxy/issues/list"
4SECTION = "libs" 4SECTION = "libs"
5LICENSE = "LGPLv2.1+" 5LICENSE = "LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
7 file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" 7 file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0"
8 8
9DEPENDS = "gconf glib-2.0" 9DEPENDS = "gconf glib-2.0"
10 10
11PR = "r6"
12
13SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.zip \ 11SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.zip \
14 file://g++-namepace.patch \
15 file://libproxy_fix_for_gcc4.7.patch \
16 file://libproxy-0.4.7-CVE-2012-4504.patch \
17 " 12 "
18 13
19SRC_URI[md5sum] = "62585570de17d10f03a5a63b701ffd52" 14SRC_URI[md5sum] = "06be230b8b612e64997f8f15af6373aa"
20SRC_URI[sha256sum] = "429a19c57d9990349d622beecc805b23051caa62a478066bff5d9a312a8937be" 15SRC_URI[sha256sum] = "3175abcb49c0b37fd82c697927783bf7d53de3884a8559bc594e59caa09bdb04"
21 16
22inherit cmake pkgconfig 17inherit cmake pkgconfig
23 18