summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/librepo
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-06-09 05:24:42 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-12 15:08:31 +0100
commitbcb84911b34534d67dd40b29fe80c2c46694c6fd (patch)
tree3754a395bd87d795b5380c2a5181076d9520ac62 /meta/recipes-devtools/librepo
parent4d1866bd28ddb6a951a9502bc09767221266745a (diff)
downloadpoky-bcb84911b34534d67dd40b29fe80c2c46694c6fd.tar.gz
librepo: Fix typo: correct LRO_SSLVERIFYHOST with CURLOPT_SSL_VERIFYHOST
The commit 51d32c6cd88ba0139c32793183fd6a236c1ef456 in git://github.com/rpm-software-management/librepo.git ... Author: Tomas Mlcoch <tmlcoch@redhat.com> Date: Mon May 5 14:31:35 2014 +0200 Add LRO_SSLVERIFYPEER and LRO_SSLVERIFYHOST options (RhBug: 1093014) ... It incorrectly setopt CURLOPT_SSL_VERIFYPEER for LRO_SSLVERIFYHOST. Use CURLOPT_SSL_VERIFYHOST to correct. (From OE-Core rev: 266545f5f5758be397a6c2cd4727d5c0895c924d) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/librepo')
-rw-r--r--meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch40
-rw-r--r--meta/recipes-devtools/librepo/librepo_git.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch b/meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch
new file mode 100644
index 0000000000..b0c7d1ca30
--- /dev/null
+++ b/meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch
@@ -0,0 +1,40 @@
1From a4bbbccce6edc1a2d1bd475506e2975fd7696c88 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 8 Jun 2017 16:31:30 +0800
4Subject: [PATCH] Fix typo: correct LRO_SSLVERIFYHOST with
5 CURLOPT_SSL_VERIFYHOST
6
7In commit 51d32c6cd88ba0139c32793183fd6a236c1ef456
8---
9Author: Tomas Mlcoch <tmlcoch@redhat.com>
10Date: Mon May 5 14:31:35 2014 +0200
11
12 Add LRO_SSLVERIFYPEER and LRO_SSLVERIFYHOST options (RhBug: 1093014)
13---
14
15It incorrectly setopt CURLOPT_SSL_VERIFYPEER for LRO_SSLVERIFYHOST.
16Use CURLOPT_SSL_VERIFYHOST to correct.
17
18Upstream-Status: Submitted
19
20Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
21---
22 librepo/handle.c | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/librepo/handle.c b/librepo/handle.c
26index ccea79b..ff39db4 100644
27--- a/librepo/handle.c
28+++ b/librepo/handle.c
29@@ -629,7 +629,7 @@ lr_handle_setopt(LrHandle *handle,
30
31 case LRO_SSLVERIFYHOST:
32 handle->sslverifyhost = va_arg(arg, long) ? 2 : 0;
33- c_rc = curl_easy_setopt(c_h, CURLOPT_SSL_VERIFYPEER, handle->sslverifyhost);
34+ c_rc = curl_easy_setopt(c_h, CURLOPT_SSL_VERIFYHOST, handle->sslverifyhost);
35 break;
36
37 case LRO_SSLCLIENTCERT:
38--
392.7.4
40
diff --git a/meta/recipes-devtools/librepo/librepo_git.bb b/meta/recipes-devtools/librepo/librepo_git.bb
index 2f194f1439..3238b14fac 100644
--- a/meta/recipes-devtools/librepo/librepo_git.bb
+++ b/meta/recipes-devtools/librepo/librepo_git.bb
@@ -7,6 +7,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \
7 file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ 7 file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \
8 file://0003-tests-fix-a-race-when-deleting-temporary-directories.patch \ 8 file://0003-tests-fix-a-race-when-deleting-temporary-directories.patch \
9 file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ 9 file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
10 file://0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch \
10 " 11 "
11 12
12PV = "1.7.20+git${SRCPV}" 13PV = "1.7.20+git${SRCPV}"