[gentoo-commits] gentoo-x86 commit in net-libs/libproxy/files: libproxy-0.4.10-disable-pac-test.patch libproxy-0.4.10-mozjs185.pc.patch

["Alexandre Rostovtsev (tetromino)" <tetromino@gentoo.org>]

tetromino    12/10/16 08:04:33

  Added:                libproxy-0.4.10-disable-pac-test.patch
                        libproxy-0.4.10-mozjs185.pc.patch
  Log:
  Version bump; fixes buffer overflow (bug #438146, CVE-2012-4504, thanks to Agostino Sarubbo). Re-add USE=webkit since it now works correctly (bug #412573, thanks to Lucian Muresan) and it enable by default to provide PAC and WPAD support. Alternatively, spidermonkey could be used for PAC instead (but might lead to firefox crashes, see bug #373397). Update license.
  
  (Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch?rev=1.1&content-type=text/plain

Index: libproxy-0.4.10-disable-pac-test.patch
===================================================================
From 5a1a8d2b920006e54d9de971999b443073f50843 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Tue, 16 Oct 2012 03:30:50 -0400
Subject: [PATCH] Disable PAC test

get-pac-test freezes when run from the ebuild, but succeeds when
building manually. Using Xemake/virtualx.eclass doesn't seem to help.
---
 libproxy/test/CMakeLists.txt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/libproxy/test/CMakeLists.txt b/libproxy/test/CMakeLists.txt
index 8894425..69543a4 100644
--- a/libproxy/test/CMakeLists.txt
+++ b/libproxy/test/CMakeLists.txt
@@ -17,10 +17,3 @@ if(WIN32)
   target_link_libraries(url-encode ws2_32)
 endif()
 add_test(NAME url-encode COMMAND ${CMAKE_CURRENT_BINARY_DIR}/url-encode)
-
-# Get PAC
-if (NOT WIN32)
-add_executable(get-pac-test ${CMAKE_CURRENT_SOURCE_DIR}/get-pac-test.cpp ${PROJECT_SOURCE_DIR}/url.cpp)
-target_link_libraries(get-pac-test pthread)
-add_test(NAME get-pac-test COMMAND ${CMAKE_CURRENT_BINARY_DIR}/get-pac-test)
-endif()
-- 
1.7.12.3




1.1                  net-libs/libproxy/files/libproxy-0.4.10-mozjs185.pc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/files/libproxy-0.4.10-mozjs185.pc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libproxy/files/libproxy-0.4.10-mozjs185.pc.patch?rev=1.1&content-type=text/plain

Index: libproxy-0.4.10-mozjs185.pc.patch
===================================================================
From dd09f546f0287cfeae587c723c98f70f3de65ab8 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Tue, 16 Oct 2012 03:03:48 -0400
Subject: [PATCH] Gentoo's mozjs185.pc doesn't set Version:

---
 libproxy/cmake/modules/pacrunner_mozjs.cmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk
index 636bcc1..21072db 100644
--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
@@ -9,7 +9,7 @@ if(WIN32)
 elseif(NOT APPLE)
   option(WITH_MOZJS "Search for MOZJS package" ON)
   if (WITH_MOZJS)
-    pkg_search_module(MOZJS mozjs185>=1.8.5)
+    pkg_search_module(MOZJS mozjs185)
     if(MOZJS_FOUND)
       include_directories(${MOZJS_INCLUDE_DIRS})
       link_directories(${MOZJS_LIBRARY_DIRS})
-- 
1.7.12.3