From d392567d75c45aba9c05c60ac9d9e6a545e8240a Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 7 Dec 2020 18:58:54 +0800 Subject: [PATCH 1/2] [patch tracking] 20201207185849783757 - https://github.com/libproxy/libproxy/commit/b159ea2be019ccda2c8e4155af0fc58b0adefb27 --- b159ea2be019ccda2c8e4155af0fc58b0adefb27.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 b159ea2be019ccda2c8e4155af0fc58b0adefb27.patch diff --git a/b159ea2be019ccda2c8e4155af0fc58b0adefb27.patch b/b159ea2be019ccda2c8e4155af0fc58b0adefb27.patch new file mode 100644 index 0000000..5a32716 --- /dev/null +++ b/b159ea2be019ccda2c8e4155af0fc58b0adefb27.patch @@ -0,0 +1,12 @@ +diff --git a/libproxy/url.cpp b/libproxy/url.cpp +index 7839afa..76ae47f 100644 +--- a/libproxy/url.cpp ++++ b/libproxy/url.cpp +@@ -26,6 +26,7 @@ + #include // For int/string conversion (using stringstream) + #include // For sscanf() + #include // For atoi() ++#include // For errno and EINTR + #include // For stat() + #include // For transform() + -- Gitee From 0827fe317b795bd75ab0cd91055aeae6a58f54cb Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 7 Dec 2020 18:58:54 +0800 Subject: [PATCH 2/2] [patch tracking] 20201207185849783757 - update spec file --- libproxy.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libproxy.spec b/libproxy.spec index 92fbb27..d4b7d7e 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: b159ea2be019ccda2c8e4155af0fc58b0adefb27.patch BuildRequires: cmake >= 2.6.0 gcc-c++ @@ -116,6 +117,9 @@ make test %{_mandir}/man1/proxy.1* %changelog +* 20201207185849783757 patch-tracking 0.4.15-20 +- append patch file of upstream repository from to + * 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