From a5635f547e5b309ead38330d419e6e8aa019a9ef Mon Sep 17 00:00:00 2001
From: Ryan Thomas <ryan@ryant.org>
Date: Tue, 5 May 2015 21:10:16 +0100
Subject: [PATCH] Bump cabal-install version to v1.18.1.0 and update changelog
---
cabal-install/bootstrap.sh | 2 +-
cabal-install/cabal-install.cabal | 2 +-
cabal-install/changelog | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index c221317065..322ee52fcf 100755
--- a/cabal-install/bootstrap.sh
+++ b/cabal-install/bootstrap.sh
@@ -53,7 +53,7 @@ PARSEC_VER="3.1.5"; PARSEC_VER_REGEXP="[23]\." # == 2.* || == 3.
DEEPSEQ_VER="1.3.0.2"; DEEPSEQ_VER_REGEXP="1\.[1-9]\." # >= 1.1 && < 2
TEXT_VER="1.1.0.0"; TEXT_VER_REGEXP="((1\.[01]\.)|(0\.([2-9]|(1[0-1]))\.))" # >= 0.2 && < 1.2
NETWORK_VER="2.6.0.2"; NETWORK_VER_REGEXP="2\." # == 2.*
-CABAL_VER="1.18.1.5"; CABAL_VER_REGEXP="1\.1[89]\." # >= 1.18 && < 1.20
+CABAL_VER="1.18.1.6"; CABAL_VER_REGEXP="1\.1[89]\." # >= 1.18 && < 1.20
TRANS_VER="0.3.0.0"; TRANS_VER_REGEXP="0\.[23]\." # >= 0.2.* && < 0.4.*
MTL_VER="2.1.2"; MTL_VER_REGEXP="[2]\." # == 2.*
HTTP_VER="4000.2.16.1"; HTTP_VER_REGEXP="4000\.[012]\." # == 4000.0.* || 4000.1.* || 4000.2.*
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 1b07b2dffc..e3a57d669e 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -1,5 +1,5 @@
Name: cabal-install
-Version: 1.18.0.8
+Version: 1.18.1.0
Synopsis: The command-line interface for Cabal and Hackage.
Description:
The \'cabal\' command-line program simplifies the process of managing
diff --git a/cabal-install/changelog b/cabal-install/changelog
index 69cd0ed829..c77bba771b 100644
--- a/cabal-install/changelog
+++ b/cabal-install/changelog
@@ -1,4 +1,8 @@
-*-change-log-*-
+1.18.1.0 Ryan Thomas <ryan@ryant.org> May 2015
+ * Force cabal upload to always use digest auth and never basic auth.
+ * Merge pull request #2367 from juhp/patch-2
+ * Fix bootstrap.sh by bumping HTTP to 4000.2.16.1
1.18.0.7 Johan Tibell <johan.tibell@gmail.com> December 2014
* Support random 1.1.
--
GitLab