diff options
| author | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-01-17 23:35:33 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-01-17 23:35:33 +0000 |
| commit | 8e8120eabdd28020aa69c7a60505cce2edd20adc (patch) | |
| tree | 061bf0acdc672720e0bc3a2d575f67d25aedb2d8 /net-libs/libproxy/files | |
| parent | c16790af2c9b4cbc38e565d4311252193ff85484 (diff) | |
| download | baldeagleos-repo-21.1.2.tar.gz baldeagleos-repo-21.1.2.tar.xz baldeagleos-repo-21.1.2.zip | |
Updating liguros repo21.1.2
Diffstat (limited to 'net-libs/libproxy/files')
4 files changed, 0 insertions, 265 deletions
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch b/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch deleted file mode 100644 index 2d40a6c1600d..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch +++ /dev/null @@ -1,118 +0,0 @@ -https://bugs.gentoo.org/732700 -https://github.com/libproxy/libproxy/issues/127 - ---- a/libproxy/extension_config.hpp -+++ b/libproxy/extension_config.hpp -@@ -31,7 +31,7 @@ using namespace libmodman; - class DLL_PUBLIC config_extension : public extension<config_extension> { - public: - // Abstract methods -- virtual vector<url> get_config(const url &dst) throw (runtime_error)=0; -+ virtual vector<url> get_config(const url &dst)=0; - - // Virtual methods - virtual string get_ignore(const url &dst); ---- a/libproxy/extension_pacrunner.cpp -+++ b/libproxy/extension_pacrunner.cpp -@@ -30,7 +30,7 @@ pacrunner_extension::~pacrunner_extension() { - if (this->pr) delete this->pr; - } - --pacrunner* pacrunner_extension::get(string pac, const url& pacurl) throw (bad_alloc) { -+pacrunner* pacrunner_extension::get(string pac, const url& pacurl) { - if (this->pr) { - if (this->last == pac) - return this->pr; ---- a/libproxy/extension_pacrunner.hpp -+++ b/libproxy/extension_pacrunner.hpp -@@ -26,7 +26,7 @@ - #define PX_PACRUNNER_MODULE_EZ(name, symb, smod) \ - class name ## _pacrunner_extension : public pacrunner_extension { \ - protected: \ -- virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc) { \ -+ virtual pacrunner* create(string pac, const url& pacurl) { \ - return new name ## _pacrunner(pac, pacurl); \ - } \ - }; \ -@@ -41,13 +41,13 @@ class DLL_PUBLIC pacrunner { - public: - pacrunner(string pac, const url& pacurl); - virtual ~pacrunner() {}; -- virtual string run(const url& url) throw (bad_alloc)=0; -+ virtual string run(const url& url)=0; - }; - - class DLL_PUBLIC pacrunner_extension : public extension<pacrunner_extension, true> { - public: - // Virtual methods -- virtual pacrunner* get(string pac, const url& pacurl) throw (bad_alloc); -+ virtual pacrunner* get(string pac, const url& pacurl); - virtual ~pacrunner_extension(); - - // Final methods -@@ -55,7 +55,7 @@ public: - - protected: - // Abstract methods -- virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc)=0; -+ virtual pacrunner* create(string pac, const url& pacurl)=0; - - private: - pacrunner* pr; ---- a/libproxy/modules/config_envvar.cpp -+++ b/libproxy/modules/config_envvar.cpp -@@ -24,7 +24,7 @@ using namespace libproxy; - - class envvar_config_extension : public config_extension { - public: -- vector<url> get_config(const url &dst) throw (runtime_error) { -+ vector<url> get_config(const url &dst) { - const char *proxy = NULL; - vector<url> response; - ---- a/libproxy/modules/config_sysconfig.cpp -+++ b/libproxy/modules/config_sysconfig.cpp -@@ -124,7 +124,7 @@ public: - ~sysconfig_config_extension() { - } - -- vector<url> get_config(const url &dst) throw (runtime_error) { -+ vector<url> get_config(const url &dst) { - map<string,string>::const_iterator it = _data.find("PROXY_ENABLED"); - vector<url> response; - ---- a/libproxy/url.cpp -+++ b/libproxy/url.cpp -@@ -115,7 +115,7 @@ string url::encode(const string &data, const string &valid_reserved) { - return encoded.str(); - } - --url::url(const string &url) throw(parse_error) -+url::url(const string &url) - : m_orig(url), m_port(0), m_ips(NULL) { - size_t idx = 0; - size_t hier_part_start, hier_part_end; -@@ -298,7 +298,7 @@ url& url::operator=(const url& url) { - return *this; - } - --url& url::operator=(string strurl) throw (parse_error) { -+url& url::operator=(string strurl) { - url tmp(strurl); - *this = tmp; - return *this; ---- a/libproxy/url.hpp -+++ b/libproxy/url.hpp -@@ -50,10 +50,10 @@ public: - - ~url(); - url(const url& url); -- url(const string& url) throw (parse_error); -+ url(const string& url); - bool operator==(const url& url) const; - url& operator=(const url& url); -- url& operator=(string url) throw (parse_error); -+ url& operator=(string url); - - string get_host() const; - sockaddr const* const* get_ips(bool usedns); diff --git a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch b/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch deleted file mode 100644 index c2d0257d437f..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch +++ /dev/null @@ -1,101 +0,0 @@ -From f594720280b2e40d81fa6e286a0ef8868687ef7e Mon Sep 17 00:00:00 2001 -From: Pierre Lejeune <superheron@gmail.com> -Date: Sat, 30 Jun 2018 21:10:06 +0200 -Subject: [PATCH] Build with mozjs-52 - -Fixes #71 ---- - libproxy/cmake/modules/pacrunner_mozjs.cmk | 2 +- - libproxy/modules/pacrunner_mozjs.cpp | 19 +++++++------------ - 2 files changed, 8 insertions(+), 13 deletions(-) - -diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk -index c2ae3db..20857fb 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 mozjs-38) -+ pkg_search_module(MOZJS mozjs-52 mozjs-60) - if(MOZJS_FOUND) - include_directories(${MOZJS_INCLUDE_DIRS}) - link_directories(${MOZJS_LIBRARY_DIRS}) -diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp -index a70b2e9..ed07c69 100644 ---- a/libproxy/modules/pacrunner_mozjs.cpp -+++ b/libproxy/modules/pacrunner_mozjs.cpp -@@ -35,6 +35,7 @@ using namespace libproxy; - #pragma GCC diagnostic ignored "-Winvalid-offsetof" - #include <jsapi.h> - #pragma GCC diagnostic error "-Winvalid-offsetof" -+#include <js/Initialization.h> - #include <js/CallArgs.h> - - #include "pacutils.h" -@@ -111,17 +112,14 @@ class mozjs_pacrunner : public pacrunner { - mozjs_pacrunner(string pac, const url& pacurl) throw (bad_alloc) : pacrunner(pac, pacurl) { - - // Set defaults -- this->jsrun = nullptr; - this->jsctx = nullptr; - JS_Init(); - -- // Initialize Javascript runtime environment -- if (!(this->jsrun = JS_NewRuntime(1024 * 1024))) goto error; -- if (!(this->jsctx = JS_NewContext(this->jsrun, 1024 * 1024))) goto error; -+ // Initialize Javascript context -+ if (!(this->jsctx = JS_NewContext(1024 * 1024))) goto error; - { - JS::RootedValue rval(this->jsctx); - JS::CompartmentOptions compart_opts; -- compart_opts.setVersion(JSVERSION_LATEST); - - this->jsglb = new JS::Heap<JSObject*>(JS_NewGlobalObject( - this->jsctx, &cls, -@@ -139,16 +137,15 @@ class mozjs_pacrunner : public pacrunner { - JS::CompileOptions options(this->jsctx); - options.setUTF8(true); - -- JS::Evaluate(this->jsctx, global, options, JAVASCRIPT_ROUTINES, -- strlen(JAVASCRIPT_ROUTINES), &rval); -+ JS::Evaluate(this->jsctx, options, JAVASCRIPT_ROUTINES, -+ strlen(JAVASCRIPT_ROUTINES), JS::MutableHandleValue(&rval)); - - // Add PAC to the environment -- JS::Evaluate(this->jsctx, global, options, pac.c_str(), pac.length(), &rval); -+ JS::Evaluate(this->jsctx, options, pac.c_str(), pac.length(), JS::MutableHandleValue(&rval)); - return; - } - error: - if (this->jsctx) JS_DestroyContext(this->jsctx); -- if (this->jsrun) JS_DestroyRuntime(this->jsrun); - throw bad_alloc(); - } - -@@ -156,7 +153,6 @@ class mozjs_pacrunner : public pacrunner { - if (this->jsac) delete this->jsac; - if (this->jsglb) delete this->jsglb; - if (this->jsctx) JS_DestroyContext(this->jsctx); -- if (this->jsrun) JS_DestroyRuntime(this->jsrun); - JS_ShutDown(); - } - -@@ -178,7 +174,7 @@ class mozjs_pacrunner : public pacrunner { - JS::RootedObject global(this->jsctx,this->jsglb->get()); - bool result = JS_CallFunctionName(this->jsctx, global, "FindProxyForURL", args, &rval); - if (!result) return ""; -- -+ - char * tmpanswer = JS_EncodeString(this->jsctx, rval.toString()); - string answer = string(tmpanswer); - JS_free(this->jsctx, tmpanswer); -@@ -188,7 +184,6 @@ class mozjs_pacrunner : public pacrunner { - } - - private: -- JSRuntime *jsrun; - JSContext *jsctx; - JS::Heap<JSObject*> *jsglb; - JSAutoCompartment *jsac; diff --git a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch b/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch deleted file mode 100644 index fc23ef2cf8e5..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a9b052c6e30101fb0b702917f245a3e2a2f08366 Mon Sep 17 00:00:00 2001 -From: Laurent Bigonville <bigon@bigon.be> -Date: Tue, 2 Oct 2018 10:22:56 +0200 -Subject: [PATCH] Add call to JS::InitSelfHostedCode() - -This is needed otherwise mozjs crashes ---- - libproxy/modules/pacrunner_mozjs.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp -index ed07c69..38e7d46 100644 ---- a/libproxy/modules/pacrunner_mozjs.cpp -+++ b/libproxy/modules/pacrunner_mozjs.cpp -@@ -118,6 +118,8 @@ class mozjs_pacrunner : public pacrunner { - // Initialize Javascript context - if (!(this->jsctx = JS_NewContext(1024 * 1024))) goto error; - { -+ if (!JS::InitSelfHostedCode(this->jsctx)) goto error; -+ - JS::RootedValue rval(this->jsctx); - JS::CompartmentOptions compart_opts; - diff --git a/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch b/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch deleted file mode 100644 index 95e56c2fe25d..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 2d6da65598b90480b4a62c4633eda035ea51681f Mon Sep 17 00:00:00 2001 -From: David King <amigadave@amigadave.com> -Date: Wed, 27 Jun 2018 06:36:00 +0100 -Subject: [PATCH] python: support Python 3.7 and 3.8 - -Add 3.7 and 3.8 to the list of accepted Python 3 versions. ---- - cmake/FindPython3Interp.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/FindPython3Interp.cmake b/cmake/FindPython3Interp.cmake -index c6cbe3d..8e5e409 100644 ---- a/cmake/FindPython3Interp.cmake -+++ b/cmake/FindPython3Interp.cmake -@@ -39,7 +39,7 @@ - - unset(_Python3_NAMES) - --set(_Python3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_Python3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(Python3Interp_FIND_VERSION) - if(Python3Interp_FIND_VERSION_COUNT GREATER 1) |
