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 @@ -include unistd.h to get prototypes of close() and read() -otherwise g++ complains - -libproxy/url.cpp:439:13: error: 'close' was not declared in this scope -libproxy/url.cpp:398:37: error: 'read' was not declared in this scope - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - -Index: libproxy-0.4.7/libproxy/url.cpp -=================================================================== ---- libproxy-0.4.7.orig/libproxy/url.cpp 2012-03-01 09:51:11.254156247 -0800 -+++ libproxy-0.4.7/libproxy/url.cpp 2012-03-01 09:56:12.058171256 -0800 -@@ -33,6 +33,7 @@ - #include <cstdlib> // For atoi() - #include <sys/stat.h> // For stat() - #include <algorithm> // For transform() -+#include <unistd.h> // For close(), read() - - #ifdef WIN32 - #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 @@ -Upstream-Status: Backport - -libproxy - CVE-2012-4504: - -Reference:https://code.google.com/p/libproxy/source/detail?r=853 - -Stack-based buffer overflow in the url::get_pac function in url.cpp -in libproxy 0.4.x before 0.4.9 allows remote servers to have an -unspecified impact via a large proxy.pac file. - -http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-4504 - -Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com> - -diff -urpN a/libproxy/url.cpp b/libproxy/url.cpp ---- a/libproxy/url.cpp 2012-11-26 10:08:47.000000000 +0800 -+++ b/libproxy/url.cpp 2012-11-26 10:05:54.000000000 +0800 -@@ -472,9 +472,10 @@ char* url::get_pac() { - // Add this chunk to our content length, - // ensuring that we aren't over our max size - content_length += chunk_length; -- if (content_length >= PAC_MAX_SIZE) break; - } - -+ if (content_length >= PAC_MAX_SIZE) break; -+ - while (recvd != content_length) { - int r = recv(sock, buffer + recvd, content_length - recvd, 0); - 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 @@ -Upstream-Status: Pending - -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -2012/04/20 -Fixes this issue with gcc 4.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) -| 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 -| /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()': -| /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 -| make[2]: *** [libproxy/CMakeFiles/libproxy.dir/modules/config_sysconfig.cpp.o] Error 1 -| 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' -| make[1]: *** [libproxy/CMakeFiles/libproxy.dir/all] Error 2 -| 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' -| make: *** [all] Error 2 -| ERROR: oe_runmake failed -NOTE: package libproxy-0.4.7-r3: task do_compile: Failed - -Index: libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp -=================================================================== ---- libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp -+++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp -@@ -21,6 +21,7 @@ - #include <cstdlib> - #include <map> - #include <fstream> -+#include <unistd.h> - - #include "../extension_config.hpp" - using namespace libproxy; |