From 042601273672d5760266cfba844ae369d5590170 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 17 Jul 2023 18:28:12 +0200
Subject: [PATCH] switch to curl when downloading plugin

---
 hp-plugin.in |  2 +-
 hplip.spec   | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/hp-plugin.in b/hp-plugin.in
index c3e7bd3..b55f8ac 100644
--- a/hp-plugin.in
+++ b/hp-plugin.in
@@ -22,7 +22,7 @@ then
   @bindir@/mkdir ~/.hplip || @bindir@/echo "Cannot create the ~/.hplip dir, exiting" && exit 1
 fi
 
-@bindir@/wget -O ~/.hplip/${PLUGIN_FILE} ${PLUGIN_SOURCE}
+@bindir@/curl --create-dir -O  --output-dir ~/.hplip ${PLUGIN_SOURCE}
 
 if [ ! -f ~/.hplip/${PLUGIN_FILE} ]
 then
diff --git a/hplip.spec b/hplip.spec
index 8e888d4..320255c 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -224,6 +224,11 @@ Patch66: hplip-nocdmfilter.patch
 # 2192131 - parseQueues() doesn't get device uri from 'lpstat -v', because parsing pattern changed
 # https://bugs.launchpad.net/hplip/+bug/2027972
 Patch67: hplip-fix-parsing-lpstat.patch
+# switch to curl by downstream patch from wget to workaround openstack dropping IPv6
+# which causes great delays...
+# Remove this once internal openstack handles IPv6 better - test by pinging IPv6 in OpenStack,
+# it should not hang.
+Patch68: hplip-plugin-curl.patch
 
 %if 0%{?fedora} || 0%{?rhel} <= 8
 # mention hplip-gui if you want to have GUI
@@ -282,6 +287,9 @@ Recommends: avahi-tools
 Recommends: libsane-hpaio%{?_isa} = %{version}-%{release}
 
 Requires: cups
+# switch to curl by downstream patch from wget to workaround openstack dropping IPv6
+# which causes great delays...
+Requires: curl-minimal
 # for bash script acting as hp-plugin (Source7)
 Requires: gawk
 # set require directly to /usr/bin/gpg, because gnupg2 and gnupg ships it,
@@ -298,7 +306,6 @@ Requires: systemd
 Requires: tar
 # require usbutils, hp-diagnose_queues needs lsusb
 Requires: usbutils
-Requires: wget
 
 # require coreutils, because timeout binary is needed in post scriptlet,
 # because hpcups-update-ppds script can freeze in certain situation and
@@ -564,6 +571,9 @@ done
 # 2192131 - parseQueues() doesn't get device uri from 'lpstat -v', because parsing pattern changed
 # https://bugs.launchpad.net/hplip/+bug/2027972
 %patch -P 67 -p1 -b .lpstat-parse
+# switch to curl by downstream patch from wget to workaround openstack dropping IPv6
+# which causes great delays...
+%patch -P 68 -p1 -b .curl-switch
 
 # Fedora specific patches now, don't put a generic patches under it
 %if 0%{?fedora} || 0%{?rhel} <= 8
@@ -937,6 +947,7 @@ find doc/images -type f -exec chmod 644 {} \;
 %changelog
 * Mon Jul 17 2023 Zdenek Dohnal <zdohnal@redhat.com> - 3.23.5-3
 - 2192131 - parseQueues() doesn't get device uri from 'lpstat -v', because parsing pattern changed
+- switch to curl when downloading plugin
 
 * Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 3.23.5-2
 - Rebuilt for Python 3.12