diff options
Diffstat (limited to 'meta/recipes-support/libproxy/libproxy')
3 files changed, 0 insertions, 81 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 @@ | |||
1 | include unistd.h to get prototypes of close() and read() | ||
2 | otherwise g++ complains | ||
3 | |||
4 | libproxy/url.cpp:439:13: error: 'close' was not declared in this scope | ||
5 | libproxy/url.cpp:398:37: error: 'read' was not declared in this scope | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Index: 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 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | libproxy - CVE-2012-4504: | ||
4 | |||
5 | Reference:https://code.google.com/p/libproxy/source/detail?r=853 | ||
6 | |||
7 | Stack-based buffer overflow in the url::get_pac function in url.cpp | ||
8 | in libproxy 0.4.x before 0.4.9 allows remote servers to have an | ||
9 | unspecified impact via a large proxy.pac file. | ||
10 | |||
11 | http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-4504 | ||
12 | |||
13 | Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com> | ||
14 | |||
15 | diff -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 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
4 | 2012/04/20 | ||
5 | Fixes 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 | ||
17 | NOTE: package libproxy-0.4.7-r3: task do_compile: Failed | ||
18 | |||
19 | Index: 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; | ||