From 87d774717a0f9d4d9f70d799bd82669e4b40d98c Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 3 Jul 2020 12:47:48 +0200
Subject: [PATCH] Resolves: #1833193 - curl: make the --krb option work again

---
 0001-curl-7.71.1-tool-krb-opt.patch | 65 +++++++++++++++++++++++++++++
 curl.spec                           |  9 +++-
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 0001-curl-7.71.1-tool-krb-opt.patch

diff --git a/0001-curl-7.71.1-tool-krb-opt.patch b/0001-curl-7.71.1-tool-krb-opt.patch
new file mode 100644
index 0000000..5e76f50
--- /dev/null
+++ b/0001-curl-7.71.1-tool-krb-opt.patch
@@ -0,0 +1,65 @@
+From a58654cbc5bea608b9c8729703a6d866ffaae8d8 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Thu, 2 Jul 2020 17:41:37 +0200
+Subject: [PATCH 1/2] tool_getparam: make --krb option work again
+
+It was disabled by mistake in commit curl-7_37_1-23-ge38ba4301.
+
+Bug: https://bugzilla.redhat.com/1833193
+Closes #5640
+
+Upstream-commit: d2fd845c35922ca73b89c617597dd5c59772e16a
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ src/tool_getparam.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tool_getparam.c b/src/tool_getparam.c
+index 3409621..9c6bc8a 100644
+--- a/src/tool_getparam.c
++++ b/src/tool_getparam.c
+@@ -813,7 +813,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
+         break;
+       case 'x': /* --krb */
+         /* kerberos level string */
+-        if(curlinfo->features & CURL_VERSION_KERBEROS4)
++        if(curlinfo->features & CURL_VERSION_SPNEGO)
+           GetStr(&config->krblevel, nextarg);
+         else
+           return PARAM_LIBCURL_DOESNT_SUPPORT;
+-- 
+2.21.3
+
+
+From 0be44560dfe3597a12b21b95798f69714ff0459a Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Thu, 2 Jul 2020 23:46:40 +0200
+Subject: [PATCH 2/2] curl_version_info.3: CURL_VERSION_KERBEROS4 is deprecated
+
+This came up in #5640. It make sense to clarify this in the docs!
+
+Reminded-by: Kamil Dudka
+Closes #5642
+
+Upstream-commit: 54f21be2e3a64b9e57130cf6d1eb4f17c44d7967
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ docs/libcurl/curl_version_info.3 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/libcurl/curl_version_info.3 b/docs/libcurl/curl_version_info.3
+index 2d21dfb..0d26e87 100644
+--- a/docs/libcurl/curl_version_info.3
++++ b/docs/libcurl/curl_version_info.3
+@@ -151,7 +151,7 @@ letters. (Added in 7.12.0)
+ .IP CURL_VERSION_IPV6
+ supports IPv6
+ .IP CURL_VERSION_KERBEROS4
+-supports Kerberos V4 (when using FTP)
++supports Kerberos V4 (when using FTP). Legacy bit. Deprecated since 7.33.0.
+ .IP CURL_VERSION_KERBEROS5
+ supports Kerberos V5 authentication for FTP, IMAP, POP3, SMTP and SOCKSv5 proxy
+ (Added in 7.40.0)
+-- 
+2.21.3
+
diff --git a/curl.spec b/curl.spec
index 2d2de5b..220bcb9 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,10 +1,13 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.71.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
 
+# curl: make the --krb option work again (#1833193)
+Patch1:   0001-curl-7.71.1-tool-krb-opt.patch
+
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.32.0-multilib.patch
 
@@ -172,6 +175,7 @@ be installed.
 %setup -q
 
 # upstream patches
+%patch1 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -350,6 +354,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal
 
 %changelog
+* Fri Jul 03 2020 Kamil Dudka <kdudka@redhat.com> - 7.71.1-2
+- curl: make the --krb option work again (#1833193)
+
 * Wed Jul 01 2020 Kamil Dudka <kdudka@redhat.com> - 7.71.1-1
 - new upstream release