From 0640aa86d6d33da70d14e10952c68c2d11f90a4d Mon Sep 17 00:00:00 2001
From: Josh Cooper <joshcooper@users.noreply.github.com>
Date: Sun, 5 May 2024 22:56:08 -0700
Subject: [PATCH] Revert "Merge pull request #842 from
 puppetlabs/revert-816-curl8"

This reverts commit 45ab2a8c8499ea54c9da9bebd0e06265d34407d4, reversing
changes made to f9068e681f7e50580e5bacb6c35571ed9cd21708.
---
 configs/components/curl.rb                    | 35 +++++++++++-----
 configs/projects/agent-runtime-main.rb        |  2 +
 .../patches/curl/curl-7.55.1-aix-poll.patch   | 40 -------------------
 3 files changed, 26 insertions(+), 51 deletions(-)
 delete mode 100644 resources/patches/curl/curl-7.55.1-aix-poll.patch

diff --git a/configs/components/curl.rb b/configs/components/curl.rb
index e07dd1810..b7100d54e 100644
--- a/configs/components/curl.rb
+++ b/configs/components/curl.rb
@@ -1,6 +1,17 @@
 component 'curl' do |pkg, settings, platform|
-  pkg.version '7.88.1'
-  pkg.sha256sum 'cdb38b72e36bc5d33d5b8810f8018ece1baa29a8f215b4495e495ded82bbf3c7'
+  # Projects may define a :curl_version setting
+  version = settings[:curl_version] || '7.88.1'
+  pkg.version version
+
+  case version
+  when '7.88.1'
+    pkg.sha256sum 'cdb38b72e36bc5d33d5b8810f8018ece1baa29a8f215b4495e495ded82bbf3c7'
+  when '8.7.1'
+    pkg.sha256sum 'f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495'
+  else
+    raise "curl version #{version} has not been configured; Cannot continue."
+  end
+
   pkg.url "https://curl.se/download/curl-#{pkg.get_version}.tar.gz"
   pkg.mirror "#{settings[:buildsources_url]}/curl-#{pkg.get_version}.tar.gz"
 
@@ -26,15 +37,17 @@
     pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
   end
 
-  # Following 3 lines should we removed once we upgrade CURL to 8.x.x
-  pkg.apply_patch 'resources/patches/curl/CVE-2023-27535.patch'
-  pkg.apply_patch 'resources/patches/curl/CVE-2023-28319.patch'
-  pkg.apply_patch 'resources/patches/curl/CVE-2023-32001.patch'
-  pkg.apply_patch 'resources/patches/curl/CVE-2023-38545.patch'
-  pkg.apply_patch 'resources/patches/curl/CVE-2023-38546.patch'
-  pkg.apply_patch 'resources/patches/curl/CVE-2023-46218.patch'
-  pkg.apply_patch 'resources/patches/curl/CVE-2024-2004.patch'
-  pkg.apply_patch 'resources/patches/curl/CVE-2024-2398.patch'
+  # Following lines should we removed once we drop curl 7
+  if version.start_with?('7')
+    pkg.apply_patch 'resources/patches/curl/CVE-2023-27535.patch'
+    pkg.apply_patch 'resources/patches/curl/CVE-2023-28319.patch'
+    pkg.apply_patch 'resources/patches/curl/CVE-2023-32001.patch'
+    pkg.apply_patch 'resources/patches/curl/CVE-2023-38545.patch'
+    pkg.apply_patch 'resources/patches/curl/CVE-2023-38546.patch'
+    pkg.apply_patch 'resources/patches/curl/CVE-2023-46218.patch'
+    pkg.apply_patch 'resources/patches/curl/CVE-2024-2004.patch'
+    pkg.apply_patch 'resources/patches/curl/CVE-2024-2398.patch'
+  end
 
   configure_options = []
   configure_options << "--with-ssl=#{settings[:prefix]}"
diff --git a/configs/projects/agent-runtime-main.rb b/configs/projects/agent-runtime-main.rb
index 355235cf6..26f20c4ca 100644
--- a/configs/projects/agent-runtime-main.rb
+++ b/configs/projects/agent-runtime-main.rb
@@ -14,6 +14,8 @@
     proj.setting :augeas_version, '1.14.1'
   end
 
+  proj.setting :curl_version, '8.7.1'
+
   ########
   # Load shared agent settings
   ########
diff --git a/resources/patches/curl/curl-7.55.1-aix-poll.patch b/resources/patches/curl/curl-7.55.1-aix-poll.patch
deleted file mode 100644
index 4c7436265..000000000
--- a/resources/patches/curl/curl-7.55.1-aix-poll.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 44b69e23fb7522e1e0d6052c4d379715f9aa6447 Mon Sep 17 00:00:00 2001
-From: Michael Smith <michael.smith@puppet.com>
-Date: Thu, 24 Aug 2017 16:43:01 -0700
-Subject: [PATCH] Compilation fails on AIX with 7.55.1 (#1828)
-
-Compilation fails on multi.c. The root of it is that on AIX, when
-_ALL_SOURCE is set to 1 (as CURL does), sys/poll.h uses #define for
-event and revent. Because multi.c includes sys/poll.h but multi.h
-doesn't, we end up with a mismatch between names for the curl_waitfd
-struct.
-
-Previously this appears to have built with curl 7.51.0 because multi.h
-also included sys/poll.h, so they were equally wrong. Based on
-https://curl.haxx.se/mail/lib-2013-02/0330.html, this appears to have
-been an issue off-and-on for years.
-
-My workaround has been to undef _ALL_SOURCE before including select.h in
-multi.c, and redefine it after. This probably isn't a good general
-solution.
----
- lib/multi.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/multi.c b/lib/multi.c
-index d5bc532ea..ecc00d3af 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -35,7 +35,9 @@
- #include "sendf.h"
- #include "timeval.h"
- #include "http.h"
-+#undef _ALL_SOURCE
- #include "select.h"
-+#define _ALL_SOURCE 1
- #include "warnless.h"
- #include "speedcheck.h"
- #include "conncache.h"
--- 
-2.14.1
-