From 4d5468716c208e78ed7bb62275dd47068d46a1ba Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 1 Jul 2019 20:50:52 +0300
Subject: [PATCH] Ignore hackage-security expiry by default

* Fixes #3731
* Fixes #4927
* Fixes #4928
---
 ChangeLog.md                    | 3 +++
 doc/yaml_configuration.md       | 6 +++++-
 subs/pantry/ChangeLog.md        | 5 +++++
 subs/pantry/src/Pantry/Types.hs | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 5ee1a44432..af03718e07 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -15,6 +15,9 @@ Behavior changes:
   some platforms and filesystems.  See
   [#4876](https://github.com/commercialhaskell/stack/issues/4876).
 
+* By default, do not perform expiry checks in Hackage Security. See
+  [#4928](https://github.com/commercialhaskell/stack/issues/4928).
+
 Other enhancements:
 
 * Do not rerun expected test failures. This is mostly a change that
diff --git a/doc/yaml_configuration.md b/doc/yaml_configuration.md
index 51e5f9a030..ba5bee4255 100644
--- a/doc/yaml_configuration.md
+++ b/doc/yaml_configuration.md
@@ -337,13 +337,17 @@ package-indices:
     key-threshold: 3 # number of keys required
 
     # ignore expiration date, see https://github.com/commercialhaskell/stack/pull/4614
-    ignore-expiry: no
+    ignore-expiry: true
 ```
 
 If you provide a replacement index which does not mirror Hackage, it
 is likely that you'll end up with significant breakage, such as most
 snapshots failing to work.
 
+Note: since Stack v2.1.3, `ignore-expiry` was changed to `true` by
+default. For more information on this change, see [issue
+#4928](https://github.com/commercialhaskell/stack/issues/4928).
+
 ### system-ghc
 
 Enables or disables using the GHC available on the PATH. (Make sure PATH is explicit, i.e., don't use ~.)
diff --git a/subs/pantry/ChangeLog.md b/subs/pantry/ChangeLog.md
index a836c97c81..340bc04cb5 100644
--- a/subs/pantry/ChangeLog.md
+++ b/subs/pantry/ChangeLog.md
@@ -9,6 +9,11 @@ Bug fixes:
 * Fix to allow dependencies on specific versions of local git repositories. See
   [#4862](https://github.com/commercialhaskell/stack/pull/4862)
 
+Behavior changes:
+
+* By default, do not perform expiry checks in Hackage Security. See
+  [#4928](https://github.com/commercialhaskell/stack/issues/4928).
+
 ## 0.1.0.0
 
 * Initial release
diff --git a/subs/pantry/src/Pantry/Types.hs b/subs/pantry/src/Pantry/Types.hs
index 4a66195bae..201eac97bb 100644
--- a/subs/pantry/src/Pantry/Types.hs
+++ b/subs/pantry/src/Pantry/Types.hs
@@ -541,7 +541,7 @@ instance FromJSON (WithJSONWarnings HackageSecurityConfig) where
     Object o <- o' ..: "hackage-security"
     hscKeyIds <- o ..: "keyids"
     hscKeyThreshold <- o ..: "key-threshold"
-    hscIgnoreExpiry <- o ..:? "ignore-expiry" ..!= False
+    hscIgnoreExpiry <- o ..:? "ignore-expiry" ..!= True
     pure HackageSecurityConfig {..}