From 03bc182966d1fdd852be40d901ce998b1eaec7b7 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Thu, 8 Jun 2017 16:43:12 -0400
Subject: Bug 1370973 - Add support for CONNECT proxy (add
 LWP::Protocol::connect)

* remove UserAgent from updates
---
 Bugzilla/Install/Requirements.pm |  1 -
 Makefile.PL                      |  9 ++++-----
 extensions/Bitly/Config.pm       | 19 ++-----------------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 54a45fd18..3113388f7 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -99,7 +99,6 @@ use constant FEATURE_FILES => (
     mfa           => ['Bugzilla/MFA/*.pm'],
     markdown      => ['Bugzilla/Markdown.pm'],
     memcached     => ['Bugzilla/Memcache.pm'],
-    auth_delegation => ['auth.cgi'],
     s3            => ['Bugzilla/S3.pm', 'Bugzilla/S3/Bucket.pm', 'Bugzilla/Attachment/S3.pm']
 );
 
diff --git a/Makefile.PL b/Makefile.PL
index 9a65060ac..cd2c46fd2 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -49,11 +49,14 @@ my %requires = (
     'Email::Send'              => '1.911',
     'File::Slurp'              => '9999.13',
     'JSON::XS'                 => '2.01',
+    'LWP::Protocol::connect'   => 0,
+    'LWP::UserAgent'           => '5.835',
     'List::MoreUtils'          => $^V > v5.10.1 ? '0.418' : '0.22',
     'Math::Random::ISAAC'      => '1.0.1',
     'Module::Metadata'         => '1.000033',
     'Module::Runtime'          => 0,
     'Moo'                      => 2,
+    'Mozilla::CA'              => 0,
     'Parse::CPAN::Meta'        => '1.44',
     'Template'                 => '2.24',
     'Text::CSV_XS'             => 0,
@@ -123,15 +126,11 @@ my %optional_features = (
             runtime => { requires => { 'Cache::Memcached::Fast' => '0.17' } }
         }
     },
-    auth_delegation => {
-        description => 'Auth Delegation',
-        prereqs => { runtime => { requires => { 'LWP::UserAgent' => 0 } } }
-    },
     updates => {
         description => 'Automatic Update Notifications',
         prereqs     => {
             runtime =>
-                { requires => { 'LWP::UserAgent' => 0, 'XML::Twig' => 0 } }
+                { requires => { 'XML::Twig' => 0 } }
         }
     },
     auth_radius => {
diff --git a/extensions/Bitly/Config.pm b/extensions/Bitly/Config.pm
index a07df0f1b..7e46a6ad8 100644
--- a/extensions/Bitly/Config.pm
+++ b/extensions/Bitly/Config.pm
@@ -13,23 +13,8 @@ use warnings;
 
 use constant NAME => 'Bitly';
 
-sub REQUIRED_MODULES {
-    return [
-        {
-            package => 'LWP',
-            module  => 'LWP',
-            version => '5.835',
-        },
-    ];
-}
-
-use constant OPTIONAL_MODULES => [
-    {
-        package => 'Mozilla-CA',
-        module  => 'Mozilla::CA',
-        version => 0
-    },
-];
+use constant REQUIRED_MODULES => [];
+use constant OPTIONAL_MODULES => [];
 
 use constant API_VERSION_MAP  => { '1_0' => '1_0' };
 
-- 
cgit v1.2.3-24-g4f1b