From d516ff460244f8ab3dd1a4d7b788bfa9884ef594ac81db67a1822bcae52b5a3e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 9 Oct 2012 18:52:59 +0000 Subject: [PATCH] Accepting request 136807 from home:dimstar:branches:GNOME:Factory Update to 0.4.8 OBS-URL: https://build.opensuse.org/request/show/136807 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=82 --- libproxy-0.4.7.tar.bz2 | 3 -- libproxy-0.4.8.tar.gz | 3 ++ libproxy-force-bipr.patch | 13 ------ libproxy-gcc47.patch | 71 -------------------------------- libproxy-javascriptcoregtk.patch | 17 -------- libproxy-mozjs185.patch | 31 -------------- libproxy-plugins.changes | 29 +++++++++++++ libproxy-plugins.spec | 21 ++-------- libproxy-trim-ignores.patch | 13 ------ libproxy.changes | 29 +++++++++++++ libproxy.spec | 21 ++-------- 11 files changed, 67 insertions(+), 184 deletions(-) delete mode 100644 libproxy-0.4.7.tar.bz2 create mode 100644 libproxy-0.4.8.tar.gz delete mode 100644 libproxy-force-bipr.patch delete mode 100644 libproxy-gcc47.patch delete mode 100644 libproxy-javascriptcoregtk.patch delete mode 100644 libproxy-mozjs185.patch delete mode 100644 libproxy-trim-ignores.patch diff --git a/libproxy-0.4.7.tar.bz2 b/libproxy-0.4.7.tar.bz2 deleted file mode 100644 index c2603e1..0000000 --- a/libproxy-0.4.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76ab598e64cde209734191dc9efd631bbbe7c161f617e420dff1896497bc0f02 -size 77714 diff --git a/libproxy-0.4.8.tar.gz b/libproxy-0.4.8.tar.gz new file mode 100644 index 0000000..18a854a --- /dev/null +++ b/libproxy-0.4.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f31a198d8f3b1ddad63fcbb63ccc8c3507d67170a43cc3cc4d0f01d070e6b37 +size 87115 diff --git a/libproxy-force-bipr.patch b/libproxy-force-bipr.patch deleted file mode 100644 index 711cb16..0000000 --- a/libproxy-force-bipr.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libproxy-0.4.7/libproxy/cmake/modules.cmk -=================================================================== ---- libproxy-0.4.7.orig/libproxy/cmake/modules.cmk -+++ libproxy-0.4.7/libproxy/cmake/modules.cmk -@@ -19,7 +19,7 @@ include(cmake/modules/pacrunner_natus.cm - include(cmake/modules/pacrunner_webkit.cmk) - - # Build the pacrunner into libproxy unless we are building for multiple engines --set(BIPR 1) -+set(BIPR 1 CACHE BOOL "Build internal pacrunner? (Always false when building more than one PR") - if((MOZJS_FOUND AND WEBKIT_FOUND) OR (MOZJS_FOUND AND NATUS_FOUND) OR (WEBKIT_FOUND AND NATUS_FOUND)) - set(BIPR 0) - endif() diff --git a/libproxy-gcc47.patch b/libproxy-gcc47.patch deleted file mode 100644 index 0bbc8b8..0000000 --- a/libproxy-gcc47.patch +++ /dev/null @@ -1,71 +0,0 @@ -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,9 @@ - #include - #include - #include -+#include -+#include -+ - - #include "../extension_config.hpp" - using namespace libproxy; -Index: libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp -=================================================================== ---- libproxy-0.4.7.orig/libproxy/modules/pacrunner_mozjs.cpp -+++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp -@@ -18,6 +18,7 @@ - ******************************************************************************/ - - #include // ? -+#include // gethostname - - #include "../extension_pacrunner.hpp" - using namespace libproxy; -@@ -85,7 +86,7 @@ static JSBool myIpAddress(JSContext *cx, - if (!gethostname(hostname, 1023)) { - JSString *myhost = JS_NewStringCopyN(cx, hostname, strlen(hostname)); - jsval arg = STRING_TO_JSVAL(myhost); -- return dnsResolve_(cx, 1, &arg); -+ return dnsResolve_(cx, arg, vp); - } - JS_free(cx, hostname); - JS_SET_RVAL(cx, vp, JSVAL_NULL); -Index: libproxy-0.4.7/libproxy/modules/pacrunner_natus.cpp -=================================================================== ---- libproxy-0.4.7.orig/libproxy/modules/pacrunner_natus.cpp -+++ libproxy-0.4.7/libproxy/modules/pacrunner_natus.cpp -@@ -18,6 +18,7 @@ - ******************************************************************************/ - - #include "../extension_pacrunner.hpp" -+#include // gethostname - using namespace libproxy; - - #define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE -Index: libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp -=================================================================== ---- libproxy-0.4.7.orig/libproxy/modules/pacrunner_webkit.cpp -+++ libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp -@@ -18,6 +18,7 @@ - ******************************************************************************/ - - #include "../extension_pacrunner.hpp" -+#include // gethostname - using namespace libproxy; - - #ifdef __APPLE__ -Index: libproxy-0.4.7/libproxy/url.cpp -=================================================================== ---- libproxy-0.4.7.orig/libproxy/url.cpp -+++ libproxy-0.4.7/libproxy/url.cpp -@@ -33,6 +33,7 @@ - #include // For atoi() - #include // For stat() - #include // For transform() -+#include // For read() close() - - #ifdef WIN32 - #include diff --git a/libproxy-javascriptcoregtk.patch b/libproxy-javascriptcoregtk.patch deleted file mode 100644 index affab35..0000000 --- a/libproxy-javascriptcoregtk.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libproxy/cmake/modules/pacrunner_webkit.cmk -=================================================================== ---- libproxy/cmake/modules/pacrunner_webkit.cmk (revision 815) -+++ libproxy/cmake/modules/pacrunner_webkit.cmk (working copy) -@@ -13,7 +13,10 @@ - endif() - else() - if(WITH_WEBKIT3) -- px_check_modules(WEBKIT webkitgtk-3.0) -+ px_check_modules(WEBKIT javascriptcoregtk-3.0>=1.5.0) -+ if(NOT WEBKIT_LIBRARIES) -+ px_check_modules(WEBKIT webkitgtk-3.0<1.5.0) -+ endif(NOT WEBKIT_LIBRARIES) - else() - px_check_modules(WEBKIT webkit-1.0) - endif() - diff --git a/libproxy-mozjs185.patch b/libproxy-mozjs185.patch deleted file mode 100644 index 6b77824..0000000 --- a/libproxy-mozjs185.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk -=================================================================== ---- libproxy-0.4.7.orig/libproxy/cmake/modules/pacrunner_mozjs.cmk -+++ libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk -@@ -7,19 +7,15 @@ if(WIN32) - include_directories("${MOZJS_INCLUDE_DIR}") - endif() - elseif(NOT APPLE) -- set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order") - option(WITH_MOZJS "Search for MOZJS package" ON) - if (WITH_MOZJS) -- foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER}) -- pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12) -- if(MOZJS_FOUND) -- include_directories(${MOZJS_INCLUDE_DIRS}) -- link_directories(${MOZJS_LIBRARY_DIRS}) -- break() -- else() -- set(MOZJS_FOUND 0) -- endif() -- endforeach() -+ pkg_search_module(MOZJS mozjs185>=1.8.5) -+ if(MOZJS_FOUND) -+ include_directories(${MOZJS_INCLUDE_DIRS}) -+ link_directories(${MOZJS_LIBRARY_DIRS}) -+ else() -+ set(MOZJS_FOUND 0) -+ endif() - else() - set(MOZJS_FOUND 0) - endif() diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index c2c2efa..d94d9c4 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Oct 2 20:47:09 UTC 2012 - dimstar@opensuse.org + +- Update to version 0.4.8: + + Only support standalone mozjs185 as mozilla js engine. + + Support building with javascritpcoregtk 1.5 + + Support sending multiple results. + * Issues fixed: + - #166: Libproxy does not parse NO_PROXY correct when the line + contains spaces + - #164: If gconf's value is an empty list, pxgconf will make + /usr/bin/proxy wait forever + - #60: use lib js for embedded solutions + - #160: strdup and gethostbyname not declared on OSX 10.7 + - #168: .pc file should be installed under OSX as well. + - #170: Also check for "Transfer-Encoding: chunked". + - #171: mozjs pacrunner: Fix parameters of dnsResolve_() + - #172: Allow to forcibly build pacrunner as module + - #173: Libproxy doesn't build with gcc 4.7 + - #147: Use ${CMAKE_DL_LIBS} instead of assuming libdl is correct. + - #176: python bindings: guard the destructor. + - #177: Speed up importing of libproxy in python. +- Drop upstream fixed patches: + + libproxy-javascriptcoregtk.patch + + libproxy-mozjs185.patch + + libproxy-trim-ignores.patch + + libproxy-gcc47.patch + + libproxy-force-bipr.patch + ------------------------------------------------------------------- Sat Jun 9 10:11:55 UTC 2012 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index e8e5462..86e97b2 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -33,29 +33,19 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy-plugins Summary: Libproxy provides consistent proxy configuration to applications -License: GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -Version: 0.4.7 +Version: 0.4.8 Release: 0 %if 0%{?build_snapshot} %define _sourcename %{_name} %else %define _sourcename %{_name}-%{version} %endif -Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 +Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf -# PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dimstar@opensuse.org -- Fix build with javascriptcoregtk3, which got split out of webkitgtk3. Patch from upstream svn. -Patch0: libproxy-javascriptcoregtk.patch -# PATCH-FIX-UPSTREAM libproxy-mozjs185.patch vuntz@opensuse.org -- Build with libmozjs185 instead of xulrunner. Patch from upstream svn. -Patch1: libproxy-mozjs185.patch -# PATCH-FIX-UPSTREAM libproxy-trim-ignores.patch bnc#739069 dimstar@opensuse.org -- Trim strings in ignore list; taken from upstream svn, r821. -Patch2: libproxy-trim-ignores.patch -# PATCH-FIX-UPSTREAM libproxy-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7. Taken from upstream svn, r833. -Patch3: libproxy-gcc47.patch -# PATCH-FIX-UPSTREAM libproxy-force-bipr.patch bnc#759123 dimstar@opensuse.org -- Allow to forcibly build pacrunners as modules, upstream r834 -Patch4: libproxy-force-bipr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -317,11 +307,6 @@ about network configuration changes. %prep %setup -q -n %{_sourcename} -%patch0 -p0 -%patch1 -p1 -%patch2 -p0 -%patch3 -p1 -%patch4 -p1 mkdir build %build diff --git a/libproxy-trim-ignores.patch b/libproxy-trim-ignores.patch deleted file mode 100644 index b594ec6..0000000 --- a/libproxy-trim-ignores.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libproxy/proxy.cpp -=================================================================== ---- libproxy/proxy.cpp (revision 819) -+++ libproxy/proxy.cpp (working copy) -@@ -268,6 +268,7 @@ - if (next == string::npos) next = confign.length(); - if (next > (i+1)) { - string ignorestr = confign.substr (i, next - i); -+ ignorestr = ignorestr.substr(ignorestr.find_first_not_of(" \t\n"), ignorestr.find_last_not_of(" \t\n")+1); - for (vector::iterator it=ignores.begin() ; it != ignores.end() && !ignored ; it++) - ignored = ((*it)->ignore(*realurl, ignorestr)); - } - diff --git a/libproxy.changes b/libproxy.changes index c2c2efa..d94d9c4 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Oct 2 20:47:09 UTC 2012 - dimstar@opensuse.org + +- Update to version 0.4.8: + + Only support standalone mozjs185 as mozilla js engine. + + Support building with javascritpcoregtk 1.5 + + Support sending multiple results. + * Issues fixed: + - #166: Libproxy does not parse NO_PROXY correct when the line + contains spaces + - #164: If gconf's value is an empty list, pxgconf will make + /usr/bin/proxy wait forever + - #60: use lib js for embedded solutions + - #160: strdup and gethostbyname not declared on OSX 10.7 + - #168: .pc file should be installed under OSX as well. + - #170: Also check for "Transfer-Encoding: chunked". + - #171: mozjs pacrunner: Fix parameters of dnsResolve_() + - #172: Allow to forcibly build pacrunner as module + - #173: Libproxy doesn't build with gcc 4.7 + - #147: Use ${CMAKE_DL_LIBS} instead of assuming libdl is correct. + - #176: python bindings: guard the destructor. + - #177: Speed up importing of libproxy in python. +- Drop upstream fixed patches: + + libproxy-javascriptcoregtk.patch + + libproxy-mozjs185.patch + + libproxy-trim-ignores.patch + + libproxy-gcc47.patch + + libproxy-force-bipr.patch + ------------------------------------------------------------------- Sat Jun 9 10:11:55 UTC 2012 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index 7d0be5a..989e017 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -33,29 +33,19 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy Summary: Libproxy provides consistent proxy configuration to applications -License: GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -Version: 0.4.7 +Version: 0.4.8 Release: 0 %if 0%{?build_snapshot} %define _sourcename %{_name} %else %define _sourcename %{_name}-%{version} %endif -Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 +Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf -# PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dimstar@opensuse.org -- Fix build with javascriptcoregtk3, which got split out of webkitgtk3. Patch from upstream svn. -Patch0: libproxy-javascriptcoregtk.patch -# PATCH-FIX-UPSTREAM libproxy-mozjs185.patch vuntz@opensuse.org -- Build with libmozjs185 instead of xulrunner. Patch from upstream svn. -Patch1: libproxy-mozjs185.patch -# PATCH-FIX-UPSTREAM libproxy-trim-ignores.patch bnc#739069 dimstar@opensuse.org -- Trim strings in ignore list; taken from upstream svn, r821. -Patch2: libproxy-trim-ignores.patch -# PATCH-FIX-UPSTREAM libproxy-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7. Taken from upstream svn, r833. -Patch3: libproxy-gcc47.patch -# PATCH-FIX-UPSTREAM libproxy-force-bipr.patch bnc#759123 dimstar@opensuse.org -- Allow to forcibly build pacrunners as modules, upstream r834 -Patch4: libproxy-force-bipr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -317,11 +307,6 @@ about network configuration changes. %prep %setup -q -n %{_sourcename} -%patch0 -p0 -%patch1 -p1 -%patch2 -p0 -%patch3 -p1 -%patch4 -p1 mkdir build %build