rpm/libproxy
SHA256
1
0
Fork 0
forked from pool/libproxy
Code Pull Requests Activity

Accepting request 137643 from GNOME:Factory

Browse Source 
Update to 0.4.8 (forwarded request 136807 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/137643
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libproxy?expand=0&rev=45
This commit is contained in:
Stephan Kulow 2012-10-12 06:06:21 +00:00 committed by Git OBS Bridge
commit 74608a7c79
11 changed files with 67 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libproxy-0.4.7.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76ab598e64cde209734191dc9efd631bbbe7c161f617e420dff1896497bc0f02
size 77714

3
libproxy-0.4.8.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f31a198d8f3b1ddad63fcbb63ccc8c3507d67170a43cc3cc4d0f01d070e6b37
size 87115

13
libproxy-force-bipr.patch
View File

@ -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()

71
libproxy-gcc47.patch
View File

@ -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 <cstdlib>
#include <map>
#include <fstream>
+#include <unistd.h>
+#include <sys/types.h>
+
#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 <cstring> // ?
+#include <unistd.h> // 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 <unistd.h> // 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 <unistd.h> // 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 <cstdlib> // For atoi()
#include <sys/stat.h> // For stat()
#include <algorithm> // For transform()
+#include <unistd.h> // For read() close()
#ifdef WIN32
#include <io.h>

17
libproxy-javascriptcoregtk.patch
View File

@ -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()

31
libproxy-mozjs185.patch
View File

@ -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()

29
libproxy-plugins.changes
View File

@ -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 Sat Jun 9 10:11:55 UTC 2012 - dimstar@opensuse.org

21
libproxy-plugins.spec
View File

@ -33,29 +33,19 @@ Url: http://code.google.com/p/libproxy/
Name: libproxy-plugins Name: libproxy-plugins
Summary: Libproxy provides consistent proxy configuration to applications 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 Group: System/Libraries
Version: 0.4.7 Version: 0.4.8
Release: 0 Release: 0
%if 0%{?build_snapshot} %if 0%{?build_snapshot}
%define _sourcename %{_name} %define _sourcename %{_name}
%else %else
%define _sourcename %{_name}-%{version} %define _sourcename %{_name}-%{version}
%endif %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 # Script used for automatic snapshot updates
Source98: update-from-svn.sh Source98: update-from-svn.sh
Source99: baselibs.conf 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -317,11 +307,6 @@ about network configuration changes.
%prep %prep
%setup -q -n %{_sourcename} %setup -q -n %{_sourcename}
%patch0 -p0
%patch1 -p1
%patch2 -p0
%patch3 -p1
%patch4 -p1
mkdir build mkdir build
%build %build

13
libproxy-trim-ignores.patch
View File

@ -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<ignore_extension*>::iterator it=ignores.begin() ; it != ignores.end() && !ignored ; it++)
ignored = ((*it)->ignore(*realurl, ignorestr));
}

29
libproxy.changes
View File

@ -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 Sat Jun 9 10:11:55 UTC 2012 - dimstar@opensuse.org

21
libproxy.spec
View File

@ -33,29 +33,19 @@ Url: http://code.google.com/p/libproxy/
Name: libproxy Name: libproxy
Summary: Libproxy provides consistent proxy configuration to applications 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 Group: System/Libraries
Version: 0.4.7 Version: 0.4.8
Release: 0 Release: 0
%if 0%{?build_snapshot} %if 0%{?build_snapshot}
%define _sourcename %{_name} %define _sourcename %{_name}
%else %else
%define _sourcename %{_name}-%{version} %define _sourcename %{_name}-%{version}
%endif %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 # Script used for automatic snapshot updates
Source98: update-from-svn.sh Source98: update-from-svn.sh
Source99: baselibs.conf 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -317,11 +307,6 @@ about network configuration changes.
%prep %prep
%setup -q -n %{_sourcename} %setup -q -n %{_sourcename}
%patch0 -p0
%patch1 -p1
%patch2 -p0
%patch3 -p1
%patch4 -p1
mkdir build mkdir build
%build %build