14 changed files with 149 additions and 920 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/0.4.15.tar.gz
+SOURCES/0.5.5.tar.gz
--- a/.libproxy.metadata
+++ b/.libproxy.metadata
@ -1 +1 @@
-2dc0fc31cad78ce3d7a5ceb8fa8df07010f5c13e SOURCES/0.4.15.tar.gz
+fc5db155854883b9ec685009f579d2c9a0ff2437 SOURCES/0.5.5.tar.gz
--- a/SOURCES/Copyright.txt
+++ b/SOURCES/Copyright.txt
@ -1,132 +0,0 @@
 CMake - Cross Platform Makefile Generator
 Copyright 2000-2021 Kitware, Inc. and Contributors
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 * Redistributions of source code must retain the above copyright
  notice, this list of conditions and the following disclaimer.
 * Redistributions in binary form must reproduce the above copyright
  notice, this list of conditions and the following disclaimer in the
  documentation and/or other materials provided with the distribution.
 * Neither the name of Kitware, Inc. nor the names of Contributors
  may be used to endorse or promote products derived from this
  software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ------------------------------------------------------------------------------
 The following individuals and institutions are among the Contributors:
 * Aaron C. Meadows <cmake@shadowguarddev.com>
 * Adriaan de Groot <groot@kde.org>
 * Aleksey Avdeev <solo@altlinux.ru>
 * Alexander Neundorf <neundorf@kde.org>
 * Alexander Smorkalov <alexander.smorkalov@itseez.com>
 * Alexey Sokolov <sokolov@google.com>
 * Alex Merry <alex.merry@kde.org>
 * Alex Turbov <i.zaufi@gmail.com>
 * Andreas Pakulat <apaku@gmx.de>
 * Andreas Schneider <asn@cryptomilk.org>
 * André Rigland Brodtkorb <Andre.Brodtkorb@ifi.uio.no>
 * Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
 * Benjamin Eikel
 * Bjoern Ricks <bjoern.ricks@gmail.com>
 * Brad Hards <bradh@kde.org>
 * Christopher Harvey
 * Christoph Grüninger <foss@grueninger.de>
 * Clement Creusot <creusot@cs.york.ac.uk>
 * Daniel Blezek <blezek@gmail.com>
 * Daniel Pfeifer <daniel@pfeifer-mail.de>
 * Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 * Eran Ifrah <eran.ifrah@gmail.com>
 * Esben Mose Hansen, Ange Optimization ApS
 * Geoffrey Viola <geoffrey.viola@asirobots.com>
 * Google Inc
 * Gregor Jasny
 * Helio Chissini de Castro <helio@kde.org>
 * Ilya Lavrenov <ilya.lavrenov@itseez.com>
 * Insight Software Consortium <insightsoftwareconsortium.org>
 * Jan Woetzel
 * Julien Schueller
 * Kelly Thompson <kgt@lanl.gov>
 * Konstantin Podsvirov <konstantin@podsvirov.pro>
 * Laurent Montel <montel@kde.org>
 * Mario Bensi <mbensi@ipsquad.net>
 * Martin Gräßlin <mgraesslin@kde.org>
 * Mathieu Malaterre <mathieu.malaterre@gmail.com>
 * Matthaeus G. Chajdas
 * Matthias Kretz <kretz@kde.org>
 * Matthias Maennich <matthias@maennich.net>
 * Michael Hirsch, Ph.D. <www.scivision.co>
 * Michael Stürmer
 * Miguel A. Figueroa-Villanueva
 * Mike Jackson
 * Mike McQuaid <mike@mikemcquaid.com>
 * Nicolas Bock <nicolasbock@gmail.com>
 * Nicolas Despres <nicolas.despres@gmail.com>
 * Nikita Krupen'ko <krnekit@gmail.com>
 * NVIDIA Corporation <www.nvidia.com>
 * OpenGamma Ltd. <opengamma.com>
 * Patrick Stotko <stotko@cs.uni-bonn.de>
 * Per Øyvind Karlsen <peroyvind@mandriva.org>
 * Peter Collingbourne <peter@pcc.me.uk>
 * Petr Gotthard <gotthard@honeywell.com>
 * Philip Lowman <philip@yhbt.com>
 * Philippe Proulx <pproulx@efficios.com>
 * Raffi Enficiaud, Max Planck Society
 * Raumfeld <raumfeld.com>
 * Roger Leigh <rleigh@codelibre.net>
 * Rolf Eike Beer <eike@sf-mail.de>
 * Roman Donchenko <roman.donchenko@itseez.com>
 * Roman Kharitonov <roman.kharitonov@itseez.com>
 * Ruslan Baratov
 * Sebastian Holtermann <sebholt@xwmw.org>
 * Stephen Kelly <steveire@gmail.com>
 * Sylvain Joubert <joubert.sy@gmail.com>
 * The Qt Company Ltd.
 * Thomas Sondergaard <ts@medical-insight.com>
 * Tobias Hunger <tobias.hunger@qt.io>
 * Todd Gamblin <tgamblin@llnl.gov>
 * Tristan Carel
 * University of Dundee
 * Vadim Zhukov
 * Will Dicharry <wdicharry@stellarscience.com>
 See version control history for details of individual contributions.
 The above copyright and license notice applies to distributions of
 CMake in source and binary form.  Third-party software packages supplied
 with CMake under compatible licenses provide their own copyright notices
 documented in corresponding subdirectories or source files.
 ------------------------------------------------------------------------------
 CMake was initially developed by Kitware with the following sponsorship:
 * National Library of Medicine at the National Institutes of Health
   as part of the Insight Segmentation and Registration Toolkit (ITK).
 * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
   Visualization Initiative.
 * National Alliance for Medical Image Computing (NAMIC) is funded by the
   National Institutes of Health through the NIH Roadmap for Medical Research,
   Grant U54 EB005149.
 * Kitware, Inc.
--- a/SOURCES/libproxy-0.4.11-crash.patch
+++ b/SOURCES/libproxy-0.4.11-crash.patch
@ -1,41 +0,0 @@
 diff -up libproxy-0.4.11/libproxy/extension_pacrunner.cpp.crash libproxy-0.4.11/libproxy/extension_pacrunner.cpp
 --- libproxy-0.4.11/libproxy/extension_pacrunner.cpp.crash	2010-07-29 08:14:59.000000000 -0400
 +++ libproxy-0.4.11/libproxy/extension_pacrunner.cpp	2013-11-11 15:23:56.987266457 -0500
@@ -22,20 +22,10 @@ using namespace libproxy;
 pacrunner::pacrunner(string, const url&) {}
 -pacrunner_extension::pacrunner_extension() {
 -	this->pr = NULL;
 -}
 +pacrunner_extension::pacrunner_extension() {}
 -pacrunner_extension::~pacrunner_extension() {
 -	if (this->pr) delete this->pr;
 -}
 +pacrunner_extension::~pacrunner_extension() {}
 pacrunner* pacrunner_extension::get(string pac, const url& pacurl) throw (bad_alloc) {
 -	if (this->pr) {
 -		if (this->last == pac)
 -			return this->pr;
 -		delete this->pr;
 -	}
 -
 -	return this->pr = this->create(pac, pacurl);
 +	return this->create(pac, pacurl);
 }
 diff -up libproxy-0.4.11/libproxy/proxy.cpp.crash libproxy-0.4.11/libproxy/proxy.cpp
 --- libproxy-0.4.11/libproxy/proxy.cpp.crash	2013-11-11 15:25:27.309271353 -0500
 +++ libproxy-0.4.11/libproxy/proxy.cpp	2013-11-11 15:25:31.569271584 -0500
@@ -416,7 +416,9 @@ void proxy_factory::run_pac(url &realurl
 		/* Run the PAC, but only try one PACRunner */
 		if (debug) cerr << "Using pacrunner: " << typeid(*pacrunners[0]).name() << endl;
 -		string pacresp = pacrunners[0]->get(this->pac, this->pacurl->to_string())->run(realurl);
 +		pacrunner* runner = pacrunners[0]->get(this->pac, this->pacurl->to_string());
 +		string pacresp = runner->run(realurl);
 +		delete runner;
 		if (debug) cerr << "Pacrunner returned: " << pacresp << endl;
 		format_pac_response(pacresp, response);
 	}
--- a/SOURCES/libproxy-0.4.15-fix-CVE-2020-25219.patch
+++ b/SOURCES/libproxy-0.4.15-fix-CVE-2020-25219.patch
@ -1,57 +0,0 @@
 From a83dae404feac517695c23ff43ce1e116e2bfbe0 Mon Sep 17 00:00:00 2001
 From: Michael Catanzaro <mcatanzaro@gnome.org>
 Date: Wed, 9 Sep 2020 11:12:02 -0500
 Subject: [PATCH] Rewrite url::recvline to be nonrecursive
 This function processes network input. It's semi-trusted, because the
 PAC ought to be trusted. But we still shouldn't allow it to control how
 far we recurse. A malicious PAC can cause us to overflow the stack by
 sending a sufficiently-long line without any '\n' character.
 Also, this function failed to properly handle EINTR, so let's fix that
 too, for good measure.
 Fixes #134
 ---
 libproxy/url.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)
 diff --git a/libproxy/url.cpp b/libproxy/url.cpp
 index ee776b2..68d69cd 100644
 --- a/libproxy/url.cpp
 +++ b/libproxy/url.cpp
@@ -388,16 +388,24 @@ string url::to_string() const {
 	return m_orig;
 }
 -static inline string recvline(int fd) {
 -	// Read a character.
 -	// If we don't get a character, return empty string.
 -	// If we are at the end of the line, return empty string.
 -	char c = '\0';
 -	
 -	if (recv(fd, &c, 1, 0) != 1 || c == '\n')
 -		return "";
 -
 -	return string(1, c) + recvline(fd);
 +static string recvline(int fd) {
 +	string line;
 +	int ret;
 +
 +	// Reserve arbitrary amount of space to avoid small memory reallocations.
 +	line.reserve(128);
 +
 +	do {
 +		char c;
 +		ret = recv(fd, &c, 1, 0);
 +		if (ret == 1) {
 +			if (c == '\n')
 +				return line;
 +			line += c;
 +		}
 +	} while (ret == 1 || (ret == -1 && errno == EINTR));
 +
 +	return line;
 }
 char* url::get_pac() {
--- a/SOURCES/libproxy-0.4.15-fix-pac-buffer-overflow.patch
+++ b/SOURCES/libproxy-0.4.15-fix-pac-buffer-overflow.patch
@ -1,93 +0,0 @@
 From 4411b523545b22022b4be7d0cac25aa170ae1d3e Mon Sep 17 00:00:00 2001
 From: Fei Li <lifeibiren@gmail.com>
 Date: Fri, 17 Jul 2020 02:18:37 +0800
 Subject: [PATCH] Fix buffer overflow when PAC is enabled
 The bug was found on Windows 10 (MINGW64) when PAC is enabled. It turned
 out to be the large PAC file (more than 102400 bytes) returned by a
 local proxy program with no content-length present.
 ---
 libproxy/url.cpp | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)
 diff --git a/libproxy/url.cpp b/libproxy/url.cpp
 index ee776b2..8684086 100644
 --- a/libproxy/url.cpp
 +++ b/libproxy/url.cpp
@@ -54,7 +54,7 @@ using namespace std;
 #define PAC_MIME_TYPE_FB "text/plain"
 // This is the maximum pac size (to avoid memory attacks)
 -#define PAC_MAX_SIZE 102400
 +#define PAC_MAX_SIZE 0x800000
 // This is the default block size to use when receiving via HTTP
 #define PAC_HTTP_BLOCK_SIZE 512
@@ -478,15 +478,13 @@ char* url::get_pac() {
 		}
 		// Get content
 -		unsigned int recvd = 0;
 -		buffer = new char[PAC_MAX_SIZE];
 -		memset(buffer, 0, PAC_MAX_SIZE);
 +		std::vector<char> dynamic_buffer;
 		do {
 			unsigned int chunk_length;
 			if (chunked) {
 				// Discard the empty line if we received a previous chunk
 -				if (recvd > 0) recvline(sock);
 +				if (!dynamic_buffer.empty()) recvline(sock);
 				// Get the chunk-length line as an integer
 				if (sscanf(recvline(sock).c_str(), "%x", &chunk_length) != 1 || chunk_length == 0) break;
@@ -498,21 +496,41 @@ char* url::get_pac() {
 			if (content_length >= PAC_MAX_SIZE) break;
 -			while (content_length == 0 || recvd != content_length) {
 -				int r = recv(sock, buffer + recvd,
 -				             content_length == 0 ? PAC_HTTP_BLOCK_SIZE
 -				                                 : content_length - recvd, 0);
 +			while (content_length == 0 || dynamic_buffer.size() != content_length) {
 +				// Calculate length to recv
 +				unsigned int length_to_read = PAC_HTTP_BLOCK_SIZE;
 +				if (content_length > 0)
 +					length_to_read = content_length - dynamic_buffer.size();
 +
 +				// Prepare buffer
 +				dynamic_buffer.resize(dynamic_buffer.size() + length_to_read);
 +
 +				int r = recv(sock, dynamic_buffer.data() + dynamic_buffer.size() - length_to_read, length_to_read, 0);
 +
 +				// Shrink buffer to fit
 +				if (r >= 0)
 +					dynamic_buffer.resize(dynamic_buffer.size() - length_to_read + r);
 +
 +				// PAC size too large, discard
 +				if (dynamic_buffer.size() >= PAC_MAX_SIZE) {
 +					chunked = false;
 +					dynamic_buffer.clear();
 +					break;
 +				}
 +
 				if (r <= 0) {
 					chunked = false;
 					break;
 				}
 -				recvd += r;
 			}
 		} while (chunked);
 -		if (content_length != 0 && string(buffer).size() != content_length) {
 -			delete[] buffer;
 -			buffer = NULL;
 +		if (content_length == 0 || content_length == dynamic_buffer.size()) {
 +			buffer = new char[dynamic_buffer.size() + 1];
 +			if (!dynamic_buffer.empty()) {
 +				memcpy(buffer, dynamic_buffer.data(), dynamic_buffer.size());
 +			}
 +			buffer[dynamic_buffer.size()] = '\0';
 		}
 	}
--- a/SOURCES/libproxy-0.4.15-mozjs-use-after-free.patch
+++ b/SOURCES/libproxy-0.4.15-mozjs-use-after-free.patch
@ -1,38 +0,0 @@
 From 738785214546ec5bb772886019529b2a6519deaf Mon Sep 17 00:00:00 2001
 From: Simon McVittie <smcv@debian.org>
 Date: Fri, 1 May 2020 19:04:22 +0100
 Subject: [PATCH] mozjs: Avoid use-after-free
 If we don't assign the temporary std::string returned by
 url_.to_string() to a variable, then it immediately goes out of scope
 and is freed, resulting in the result of c_str() pointing into freed
 memory. This works about as well as you would expect.
 Signed-off-by: Simon McVittie <smcv@debian.org>
 ---
 libproxy/modules/pacrunner_mozjs.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
 diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
 index ade6d0a..aac6531 100644
 --- a/libproxy/modules/pacrunner_mozjs.cpp
 +++ b/libproxy/modules/pacrunner_mozjs.cpp
@@ -175,14 +175,11 @@ class mozjs_pacrunner : public pacrunner {
 	string run(const url& url_) throw (bad_alloc) {
 		// Build arguments to the FindProxyForURL() function
 -		const char *tmpurl  = url_.to_string().c_str();
 -		const char *tmphost = url_.get_host().c_str();
 -		if (!tmpurl || !tmphost) {
 -			throw bad_alloc();
 -		}
 +		string tmpurl(url_.to_string());
 +		string tmphost(url_.get_host());
 		JS::AutoValueArray<2> args(this->jsctx);
 -		args[0].setString(JS_NewStringCopyZ(this->jsctx, tmpurl));
 -		args[1].setString(JS_NewStringCopyZ(this->jsctx, tmphost));
 +		args[0].setString(JS_NewStringCopyZ(this->jsctx, tmpurl.c_str()));
 +		args[1].setString(JS_NewStringCopyZ(this->jsctx, tmphost.c_str()));
 		// Find the proxy (call FindProxyForURL())
 		JS::RootedValue rval(this->jsctx);
--- a/SOURCES/libproxy-0.4.15-mozjs52.patch
+++ b/SOURCES/libproxy-0.4.15-mozjs52.patch
@ -1,124 +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)
     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;
 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;
--- a/SOURCES/libproxy-0.4.15-mozjs60.patch
+++ b/SOURCES/libproxy-0.4.15-mozjs60.patch
@ -1,23 +0,0 @@
 From 1600c6af7ed775d4ccbb239937acd92ef7162409 Mon Sep 17 00:00:00 2001
 From: Laurent Bigonville <bigon@bigon.be>
 Date: Sun, 9 Dec 2018 16:07:55 +0100
 Subject: [PATCH] Build with mozjs 60 instead
 This seems enough to make it work with mozjs 60
 ---
 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 20857fb..871cc85 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-52)
 +    pkg_search_module(MOZJS mozjs-60)
     if(MOZJS_FOUND)
       include_directories(${MOZJS_INCLUDE_DIRS})
       link_directories(${MOZJS_LIBRARY_DIRS})
--- a/SOURCES/libproxy-0.4.15-mozjs68.patch
+++ b/SOURCES/libproxy-0.4.15-mozjs68.patch
@ -1,180 +0,0 @@
 From 6c9e48accddb90eef8412bef3ccc29594935d3b3 Mon Sep 17 00:00:00 2001
 From: Iain Lane <iain@orangesquash.org.uk>
 Date: Wed, 11 Mar 2020 11:54:52 +0000
 Subject: [PATCH] mozjs: Port to mozjs 68
 There are a number of API changes that need to be adapted to, notably
  - JS_EncodeString is gone; need to use JS_EncodeStringToUTF8 now which
    requires a rooted object to be passed in.
  - JS_free is gone
 The pkg-config file ships some flags which need to be supplied to the
 build.
 ---
 libproxy/cmake/modules/pacrunner_mozjs.cmk |  6 ++-
 libproxy/modules/pacrunner_mozjs.cpp       | 56 ++++++++++++++--------
 2 files changed, 41 insertions(+), 21 deletions(-)
 diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk
 index 871cc85..2cc3c51 100644
 --- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
 +++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
@@ -9,8 +9,12 @@ if(WIN32)
 elseif(NOT APPLE)
   option(WITH_MOZJS "Search for MOZJS package" ON)
   if (WITH_MOZJS)
 -    pkg_search_module(MOZJS mozjs-60)
 +    pkg_search_module(MOZJS mozjs-68)
     if(MOZJS_FOUND)
 +      foreach(OPT ${MOZJS_CFLAGS})
 +        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPT}")
 +      endforeach()
 +      message("mozjs is " ${CMAKE_CXX_FLAGS})
       include_directories(${MOZJS_INCLUDE_DIRS})
       link_directories(${MOZJS_LIBRARY_DIRS})
     else()
 diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
 index 38e7d46..37e1b42 100644
 --- a/libproxy/modules/pacrunner_mozjs.cpp
 +++ b/libproxy/modules/pacrunner_mozjs.cpp
@@ -37,6 +37,9 @@ using namespace libproxy;
 #pragma GCC diagnostic error "-Winvalid-offsetof"
 #include <js/Initialization.h>
 #include <js/CallArgs.h>
 +#include <js/CompilationAndEvaluation.h>
 +#include <js/MemoryFunctions.h>
 +#include <js/SourceText.h>
 #include "pacutils.h"
@@ -49,19 +52,21 @@ using namespace libproxy;
 #endif
 static void dnsResolve_(JSContext *cx, JSString *hostname, JS::CallArgs *argv) {
 +	char *tmp;
 	// Get hostname argument
 -	char *tmp = JS_EncodeString(cx, hostname);
 +	JS::RootedString str(cx, hostname);
 +	JS::UniqueChars chars = JS_EncodeStringToUTF8(cx, str);
 +	const char *val = chars.get();
 	// Set the default return value
 	argv->rval().setNull();
 	// Look it up
 	struct addrinfo *info = nullptr;
 -	if (getaddrinfo(tmp, NULL, NULL, &info))
 +	if (getaddrinfo(val, NULL, NULL, &info))
 		goto out;
 	// Allocate the IP address
 -	JS_free(cx, tmp);
 	tmp = (char *) JS_malloc(cx, INET6_ADDRSTRLEN+1);
 	memset(tmp, 0, INET6_ADDRSTRLEN+1);
@@ -77,7 +82,6 @@ static void dnsResolve_(JSContext *cx, JSString *hostname, JS::CallArgs *argv) {
 	out:
 		if (info) freeaddrinfo(info);
 -		JS_free(cx, tmp);
 }
 static bool dnsResolve(JSContext *cx, unsigned argc, JS::Value *vp) {
@@ -121,29 +125,40 @@ class mozjs_pacrunner : public pacrunner {
 			if (!JS::InitSelfHostedCode(this->jsctx)) goto error;
 			JS::RootedValue  rval(this->jsctx);
 -			JS::CompartmentOptions compart_opts;
 +			JS::RealmOptions realm_opts;
 			this->jsglb = new JS::Heap<JSObject*>(JS_NewGlobalObject(
 								  this->jsctx, &cls,
 								  nullptr, JS::DontFireOnNewGlobalHook,
 -								  compart_opts));
 +								  realm_opts));
 			if (!(this->jsglb)) goto error;
 			JS::RootedObject global(this->jsctx,this->jsglb->get());
 -			if (!(this->jsac = new JSAutoCompartment(this->jsctx,  global))) goto error;
 -			if (!JS_InitStandardClasses(this->jsctx, global))            goto error;
 +			if (!(this->jsar = new JSAutoRealm(this->jsctx,  global))) goto error;
 			// Define Javascript functions
 			JS_DefineFunction(this->jsctx, global, "dnsResolve", dnsResolve, 1, 0);
 			JS_DefineFunction(this->jsctx, global, "myIpAddress", myIpAddress, 0, 0);
 			JS::CompileOptions options(this->jsctx);
 -			options.setUTF8(true);
 -			JS::Evaluate(this->jsctx, options, JAVASCRIPT_ROUTINES,
 -				     strlen(JAVASCRIPT_ROUTINES), JS::MutableHandleValue(&rval));
 +			JS::SourceText<mozilla::Utf8Unit> routines, pac_source;
 +			if (!routines.init(this->jsctx,
 +					   JAVASCRIPT_ROUTINES,
 +					   strlen(JAVASCRIPT_ROUTINES),
 +					   JS::SourceOwnership::Borrowed))
 +				goto error;
 +
 +			if (!pac_source.init(this->jsctx,
 +					     pac.c_str(),
 +					     pac.length(),
 +					     JS::SourceOwnership::Borrowed))
 +				goto error;
 +
 +
 +			JS::Evaluate(this->jsctx, options, routines, JS::MutableHandleValue(&rval));
 			// Add PAC to the environment
 -			JS::Evaluate(this->jsctx, options, pac.c_str(), pac.length(), JS::MutableHandleValue(&rval));
 +			JS::Evaluate(this->jsctx, options, pac_source, JS::MutableHandleValue(&rval));
 			return;
 		}
 		error:
@@ -152,7 +167,7 @@ class mozjs_pacrunner : public pacrunner {
 	}
 	~mozjs_pacrunner() {
 -		if (this->jsac) delete this->jsac;
 +		if (this->jsar) delete this->jsar;
 		if (this->jsglb) delete this->jsglb;
 		if (this->jsctx) JS_DestroyContext(this->jsctx);
 		JS_ShutDown();
@@ -160,11 +175,9 @@ class mozjs_pacrunner : public pacrunner {
 	string run(const url& url_) throw (bad_alloc) {
 		// Build arguments to the FindProxyForURL() function
 -		char *tmpurl  = JS_strdup(this->jsctx, url_.to_string().c_str());
 -		char *tmphost = JS_strdup(this->jsctx, url_.get_host().c_str());
 +		const char *tmpurl  = url_.to_string().c_str();
 +		const char *tmphost = url_.get_host().c_str();
 		if (!tmpurl || !tmphost) {
 -			if (tmpurl) JS_free(this->jsctx, tmpurl);
 -			if (tmphost) JS_free(this->jsctx, tmphost);
 			throw bad_alloc();
 		}
 		JS::AutoValueArray<2> args(this->jsctx);
@@ -176,10 +189,13 @@ 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 "";
 +		if (!rval.isString())
 +			return "";
 -		char * tmpanswer = JS_EncodeString(this->jsctx, rval.toString());
 +		JS::RootedString s(this->jsctx, rval.toString());
 +		JS::UniqueChars chars = JS_EncodeStringToUTF8(this->jsctx, s);
 +		const char *tmpanswer = chars.get();
 		string answer = string(tmpanswer);
 -		JS_free(this->jsctx, tmpanswer);
 		if (answer == "undefined") return "";
 		return answer;
@@ -188,7 +204,7 @@ class mozjs_pacrunner : public pacrunner {
 private:
 	JSContext *jsctx;
 	JS::Heap<JSObject*> *jsglb;
 -	JSAutoCompartment *jsac;
 +	JSAutoRealm *jsar;
 };
 PX_PACRUNNER_MODULE_EZ(mozjs, "JS_DefineFunction", "mozjs");
--- a/SOURCES/libproxy-0.4.15-python3738.patch
+++ b/SOURCES/libproxy-0.4.15-python3738.patch
@ -1,26 +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)
 -- 
 2.17.1
--- a/SOURCES/libproxy-0.4.15-python39.patch
+++ b/SOURCES/libproxy-0.4.15-python39.patch
@ -1,26 +0,0 @@
 From 869307ba7547cadef4a131581c3afdcaaec8c576 Mon Sep 17 00:00:00 2001
 From: David King <amigadave@amigadave.com>
 Date: Thu, 13 Feb 2020 12:24:17 +0000
 Subject: [PATCH] python: support Python 3.9
 Add 3.9 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 8e5e409..74398b2 100644
 --- a/cmake/FindPython3Interp.cmake
 +++ b/cmake/FindPython3Interp.cmake
@@ -39,7 +39,7 @@
 unset(_Python3_NAMES)
 -set(_Python3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 +set(_Python3_VERSIONS 3.9 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)
 -- 
 2.24.1
--- a/SOURCES/proxy.1
+++ b/SOURCES/proxy.1
@ -1,23 +0,0 @@
 .TH PROXY "1" "September 2013" "libproxy" "User Commands"
 .SH NAME
 proxy \- Display the proxy server that should be used to reach a given a network resource
 .SH SYNOPSIS
 proxy
 .SH DESCRIPTION
 Display the proxy server that should be used to reach a given a network resource.
 .PP
 libproxy is a library that provides automatic proxy configuration management
 using different backends.
 .SH EXAMPLE
 .B echo http://www.example.com/ | proxy
  http://webcache:3128 direct://
 .SH AUTHOR
 This manual page was written by
 .MT bigon@debian.org
 Laurent Bigonville
 .ME ,
 for the Debian GNU/Linux system (but may be used by others).
 .SH SEE ALSO
 .UR http://code.google.com/p/libproxy/
 libproxy
 .UE .
--- a/SPECS/libproxy.spec
+++ b/SPECS/libproxy.spec
@ -1,64 +1,64 @@
-# When we are bootstrapping, we drop some dependencies.
+## START: Set by rpmautospec
-# Set this to 0 after bootstrapping.
+## (rpmautospec version 0.6.1)
-%{!?_with_bootstrap: %global bootstrap 0}
+## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
    release_number = 3;
    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
    print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
 ## END: Set by rpmautospec
 %global _privatelibs libpxbackend-1.0[.]so.*
 %global __provides_exclude ^(%{_privatelibs})$
 %global __requires_exclude ^(%{_privatelibs})$
 Name:           libproxy
-Version:        0.4.15
+Version:        0.5.5
-Release:        35%{?dist}
+Release:        %autorelease
 Summary:        A library handling all the details of proxy configuration
-License:        LGPLv2+
+License:        LGPL-2.1-or-later
 URL:            https://libproxy.github.io/libproxy/
-Source0:        https://github.com/libproxy/%{name}/archive/%{version}.tar.gz
+Source0:        https://github.com/libproxy/%{name}/archive/refs/tags/%{version}.tar.gz
-# Taken from the Debian package.
+
-Source1:        proxy.1
+BuildRequires:  gcc
-Source2:        Copyright.txt
+BuildRequires:  meson
-Patch1:         libproxy-0.4.11-crash.patch
+BuildRequires:  /usr/bin/gi-docgen
-Patch2:         libproxy-0.4.15-python3738.patch
+BuildRequires:  /usr/bin/vapigen
-# https://github.com/libproxy/libproxy/pull/86
+
-# https://github.com/libproxy/libproxy/pull/87
+BuildRequires:  pkgconfig(duktape)
-Patch3:         libproxy-0.4.15-mozjs52.patch
+BuildRequires:  pkgconfig(gio-2.0) >= 2.71.3
-# https://github.com/libproxy/libproxy/pull/95
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
-Patch4:         libproxy-0.4.15-mozjs60.patch
+BuildRequires:  pkgconfig(libcurl)
 # https://github.com/libproxy/libproxy/pull/106
 Patch5:         libproxy-0.4.15-python39.patch
 # https://github.com/libproxy/libproxy/pull/109
 Patch6:         libproxy-0.4.15-mozjs68.patch
 # https://github.com/libproxy/libproxy/pull/118
 Patch7:         libproxy-0.4.15-mozjs-use-after-free.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1880350
 Patch8:         libproxy-0.4.15-fix-CVE-2020-25219.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1883584
 Patch9:         libproxy-0.4.15-fix-pac-buffer-overflow.patch
 BuildRequires:  cmake >= 2.6.0
 BuildRequires:  gcc-c++
 %if ! 0%{?bootstrap}
 # gnome
 BuildRequires:  pkgconfig(gio-2.0) >= 2.26
 # webkit (gtk3)
 BuildRequires:  pkgconfig(javascriptcoregtk-4.0)
 # Python
 BuildRequires:  python3-devel
-%else
+# For config-gnome
-# Obsoletes of disabled subpackages.
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
 # Folded into main package in 0.5.0. Remove in F41.
 Provides: python3-%{name} = %{version}-%{release}
 Provides: %{name}-pac = %{version}-%{release}
 # Obsoletes of subpackages prior to 0.5.0 rewrite. Remove in F41.
 Provides: %{name}-gnome = %{version}-%{release}
 Obsoletes: %{name}-gnome < %{version}-%{release}
 Provides: %{name}-kde = %{version}-%{release}
 Obsoletes: %{name}-kde < %{version}-%{release}
 Provides: %{name}-mozjs = %{version}-%{release}
 Obsoletes: %{name}-mozjs < %{version}-%{release}
 Provides: %{name}-pacrunner = %{version}-%{release}
 Obsoletes: %{name}-pacrunner < %{version}-%{release}
 Provides: %{name}-webkitgtk4 = %{version}-%{release}
 Obsoletes: %{name}-webkitgtk4 < %{version}-%{release}
-%endif
+Provides: %{name}-duktape = %{version}-%{release}
-# The Python 2 subpackage was removed. Remove in F32.
+Obsoletes: %{name}-duktape < %{version}-%{release}
 Obsoletes: python2-libproxy < %{version}-%{release}
 %description
 libproxy offers the following features:
-    * extremely small core footprint (< 35K)
+    * extremely small core footprint
-    * no external dependencies within libproxy core
+    * minimal dependencies within libproxy core
-      (libproxy plugins may have dependencies)
+    * only 4 functions in the stable-ish external API
    * only 3 functions in the stable external API
    * dynamic adjustment to changing network topology
    * a standard way of dealing with proxy settings across all scenarios
    * a sublime sense of joy and accomplishment
@ -71,45 +71,6 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description    bin
 The %{name}-bin package contains the proxy binary for %{name}
 %if ! 0%{?bootstrap}
 %package -n     python3-%{name}
 Summary:        Binding for %{name} and python3
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 %{?python_provide:%python_provide python3-%{name}}
 %description -n python3-%{name}
 The python3 binding for %{name}
 %package        gnome
 Summary:        Plugin for %{name} and gnome
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description    gnome
 The %{name}-gnome package contains the %{name} plugin for gnome.
 %if 0%{?fedora}
 %package        kde
 Summary:        Plugin for %{name} and kde
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       /usr/bin/kreadconfig5
 %description    kde
 The %{name}-kde package contains the %{name} plugin for kde.
 %endif
 %package        webkitgtk4
 Summary:        Plugin for %{name} and webkitgtk3
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Provides:       %{name}-pac = %{version}-%{release}
 Obsoletes:      %{name}-mozjs <= %{version}-%{release}
 %description    webkitgtk4
 The %{name}-webkitgtk4 package contains the %{name} plugin for
 webkitgtk3.
 %endif
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@ -123,102 +84,131 @@ developing applications that use %{name}.
 %build
-export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
+%meson \
-%{cmake} \
+  -Dconfig-gnome=true \
-  -DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \
+  -Dconfig-kde=true \
-  -DBIPR=OFF \
+  -Dconfig-osx=false \
-%if 0%{?fedora}
+  -Dconfig-windows=false \
-  -DWITH_KDE=ON \
+  -Dintrospection=true \
-%else
+  -Dtests=true \
-  -DWITH_KDE=OFF \
+  -Dvapi=true
-%endif
+%meson_build
  -DWITH_MOZJS=OFF \
  -DWITH_PERL=OFF \
 %if ! 0%{?bootstrap}
  -DWITH_GNOME3=ON \
  -DWITH_PYTHON2=OFF \
  -DWITH_PYTHON3=ON \
  -DWITH_WEBKIT3=ON \
 %else
  -DWITH_PYTHON2=OFF \
  -DWITH_PYTHON3=OFF \
 %endif
   .
 %cmake_build
 %install
-%cmake_install
+%meson_install
 #In case all modules are disabled
 mkdir -p %{buildroot}%{_libdir}/%{name}/%{version}/modules
 # Man page.
 install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1
 # CMake license (for FindPython[2,3]Interp.cmake)
 install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/licenses/libproxy/Copyright.txt
 %check
-%ctest
+%meson_test
 %ldconfig_scriptlets
 %files
-%doc AUTHORS README
+%doc CHANGELOG.md README.md
 %license COPYING
-%license Copyright.txt
+%dir %{_libdir}/girepository-1.0
-%{_libdir}/*.so.*
+%{_libdir}/girepository-1.0/Libproxy-1.0.typelib
-%dir %{_libdir}/%{name}
+%{_libdir}/libproxy.so.*
-%dir %{_libdir}/%{name}/%{version}
+%dir %{_libdir}/libproxy
-%dir %{_libdir}/%{name}/%{version}/modules
+%{_libdir}/libproxy/libpxbackend-1.0.so
 %files bin
 %{_bindir}/proxy
-%{_mandir}/man1/proxy.1*
+%{_mandir}/man8/proxy.8*
-%if ! 0%{?bootstrap}
+%files devel
-%files -n python3-%{name}
+%{_docdir}/libproxy-1.0/
-%{python3_sitelib}/__pycache__/*
+%{_includedir}/libproxy/
-%{python3_sitelib}/%{name}.*
+%{_libdir}/libproxy.so
 %{_libdir}/pkgconfig/libproxy-1.0.pc
 %dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/Libproxy-1.0.gir
 %dir %{_datadir}/vala/vapi/
 %{_datadir}/vala/vapi/libproxy-1.0.deps
 %{_datadir}/vala/vapi/libproxy-1.0.vapi
 %files gnome
 %{_libdir}/%{name}/%{version}/modules/config_gnome3.so
 %{_libexecdir}/pxgsettings
-%if 0%{?fedora}
+%changelog
-%files kde
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.5.5-3
-%{_libdir}/%{name}/%{version}/modules/config_kde.so
+- Rebuilt for MSVSphere 10
 %endif
-%files webkitgtk4
+## START: Generated by rpmautospec
-%{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.5.5-3
-%endif
+- Bump release for June 2024 mass rebuild
-%files devel
+* Thu Apr 18 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 0.5.5-2
-%{_includedir}/proxy.h
+- Add gating.yaml
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libproxy-1.0.pc
 %{_datadir}/cmake/Modules/Findlibproxy.cmake
 * Thu Apr 18 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 0.5.5-1
 - Update to 0.5.5
-%changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-5
-* Wed Aug 25 2021 Michael Santana <msantana@redhat.com> - 0.4.15-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
- Drop networkmanager subpackage. Resolves: rhbz#1996028
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 * Thu Nov 02 2023 David King <amigadave@amigadave.com> - 0.5.3-3
 - Install a versioned library symlink (#2247508)
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 * Fri Jul 07 2023 David King <amigadave@amigadave.com> - 0.5.3-1
 - Update to 0.5.3
 * Sun Jun 18 2023 David King <amigadave@amigadave.com> - 0.5.2-1
 - Update to 0.5.2
 * Wed May 24 2023 David King <amigadave@amigadave.com> - 0.5.1-1
 - Update to 0.5.1
 * Tue May 23 2023 David King <amigadave@amigadave.com> - 0.5.0-3
 - Fix libproxy rpath (#2209173)
 * Mon May 22 2023 Adam Williamson <awilliam@redhat.com> - 0.5.0-2
 - Add missing obsolete/provide for libproxy-duktape
-* Wed Aug 18 2021 Michael Santana <msantana@redhat.com> - 0.4.15-34
+* Tue May 16 2023 David King <amigadave@amigadave.com> - 0.5.0-1
- Drop pacrunner subpackage. Resolves: rhbz#1990974
+- Update to 0.5.0
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.4.15-33
+* Wed Feb 08 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.4.18-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Soften KDE dependency
  Related: rhbz#1991688
-* Tue Jul 27 2021 Michael Santana <msantana@redhat.com> - 0.4.15-32
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.18-5
- Add Copyright.txt. Resolves: rhbz#1986586
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.4.15-31
+* Fri Dec 16 2022 František Zatloukal <fzatlouk@redhat.com> - 0.4.18-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for duktape 2.7.0
 * Wed Jul 20 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 0.4.18-3
 - Replace WebKitGTK pacrunner backend with duktape
 * Tue Jul 19 2022 Milan Crha <mcrha@redhat.com> - 0.4.18-2
 - Change WebKitGTK API dependency to 4.1 (using libsoup3)
 * Tue Jun 21 2022 David King <amigadave@amigadave.com> - 0.4.18-1
 - Update to 0.4.18
 * Mon Jun 20 2022 David King <amigadave@amigadave.com> - 0.4.17-6
 - Accept Python 3.11 (#2098739)
 * Mon Mar 28 2022 David King <amigadave@amigadave.com> - 0.4.17-5
 - Fix build (#2069137)
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.17-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 * Mon Jun 21 2021 David King <amigadave@amigadave.com> - 0.4.17-2
 - Rebuilt for Python 3.10 (#1898060)
 * Fri May 28 2021 David King <amigadave@amigadave.com> - 0.4.17-1
 - Update to 0.4.17
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.15-30
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@ -533,3 +523,5 @@ install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/licenses/libproxy/Copyright
 * Tue Jun 3 2008 - dominique-rpm@leuenberger.net
 - Initial spec file for Version 0.2.2
 ## END: Generated by rpmautospec
`@ -1 +1 @@`
	`2dc0fc31cad78ce3d7a5ceb8fa8df07010f5c13e SOURCES/0.4.15.tar.gz`	`fc5db155854883b9ec685009f579d2c9a0ff2437 SOURCES/0.5.5.tar.gz`