From 2c8b463090169dba213d73199138324f60e984c3 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 15 Dec 2020 16:58:53 +0800 Subject: [PATCH 1/2] [patch tracking] 20201215165849782586 - https://github.com/libproxy/libproxy/commit/85a5b07a338550090a005aa9e881951009fdd0dc --- 85a5b07a338550090a005aa9e881951009fdd0dc.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 85a5b07a338550090a005aa9e881951009fdd0dc.patch diff --git a/85a5b07a338550090a005aa9e881951009fdd0dc.patch b/85a5b07a338550090a005aa9e881951009fdd0dc.patch new file mode 100644 index 0000000..0bea7e5 --- /dev/null +++ b/85a5b07a338550090a005aa9e881951009fdd0dc.patch @@ -0,0 +1,17 @@ +diff --git a/bindings/python/libproxy.py b/bindings/python/libproxy.py +index 2224a19..21c64b4 100644 +--- a/bindings/python/libproxy.py ++++ b/bindings/python/libproxy.py +@@ -35,12 +35,6 @@ def _load(name, *versions): + return ctypes.cdll.LoadLibrary(name_ver) + raise ImportError("Unable to find %s library" % name) + +-# Load C library +-if platform.system() == "Windows": +- _libc = ctypes.cdll.msvcrt +-else: +- _libc = _load("c", 6) +- + # Load libproxy + _libproxy = _load("proxy", 1) + _libproxy.px_proxy_factory_new.restype = ctypes.POINTER(ctypes.c_void_p) -- Gitee From ce0e24e2292cb595e28c2dda4d764145e410f004 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 15 Dec 2020 16:58:53 +0800 Subject: [PATCH 2/2] [patch tracking] 20201215165849782586 - update spec file --- libproxy.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libproxy.spec b/libproxy.spec index 92fbb27..01ec44c 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -1,6 +1,6 @@ Name: libproxy Version: 0.4.15 -Release: 19 +Release: 20 Summary: Libproxy is a library that provides automatic proxy configuration management License: LGPLv2+ @@ -19,6 +19,7 @@ Patch5: libproxy-0.4.15-mozjs60.patch Patch6: libproxy-0.4.15-mozjs68.patch Patch7: libproxy-0.4.15-mozjs-use-after-free.patch Patch8: libproxy-0.4.15-fix-CVE-2020-25219.patch +Patch6000: 85a5b07a338550090a005aa9e881951009fdd0dc.patch BuildRequires: cmake >= 2.6.0 gcc-c++ @@ -116,6 +117,9 @@ make test %{_mandir}/man1/proxy.1* %changelog +* 20201215165849782586 patch-tracking 0.4.15-20 +- append patch file of upstream repository from <85a5b07a338550090a005aa9e881951009fdd0dc> to <85a5b07a338550090a005aa9e881951009fdd0dc> + * Wed Dec 02 2020 xihaochen - 0.4.15-19 - Type:requirements - Id:NA @@ -169,4 +173,4 @@ make test - DESC:remove the /usr/bin/kreadconfig5 in buildRequires. * Tue Sep 10 2019 liyongqiang - 0.4.15-10 -- Package init +- Package init \ No newline at end of file -- Gitee