cabal-install 1.18.0.8 → 1.18.1.0

raw patch · 4 files changed

+14/−31 lines, 4 files

Files

• Distribution/Client/HttpUtils.hs +6/−6
• Distribution/Client/Upload.hs +5/−22
• bootstrap.sh +2/−2
• cabal-install.cabal +1/−1

@@ -17,8 +17,8 @@ import Network.URI          ( URI (..), URIAuth (..) ) import Network.Browser-         ( BrowserAction, browse-         , setOutHandler, setErrHandler, setProxy, setAuthorityGen, request)+         ( BrowserAction, browse, setAllowBasicAuth, setAuthorityGen+         , setOutHandler, setErrHandler, setProxy, request) import Network.Stream          ( Result, ConnError(..) ) import Control.Monad@@ -76,10 +76,10 @@         -> Maybe String -- ^ Optional etag to check if we already have the latest file.         -> IO (Result (Response ByteString)) getHTTP verbosity uri etag = liftM (\(_, resp) -> Right resp) $-                                   cabalBrowse verbosity (return ()) (request (mkRequest uri etag))+                                   cabalBrowse verbosity Nothing (request (mkRequest uri etag))  cabalBrowse :: Verbosity-            -> BrowserAction s ()+            -> Maybe (String, String)             -> BrowserAction s a             -> IO a cabalBrowse verbosity auth act = do@@ -88,8 +88,8 @@         setProxy p         setErrHandler (warn verbosity . ("http error: "++))         setOutHandler (debug verbosity)-        auth-        setAuthorityGen (\_ _ -> return Nothing)+        setAllowBasicAuth False+        setAuthorityGen (\_ _ -> return auth)         act  downloadURI :: Verbosity

@@ -15,12 +15,10 @@ import qualified Distribution.Client.BuildReports.Upload as BuildReport  import Network.Browser-         ( BrowserAction, request-         , Authority(..), addAuthority )+         ( request ) import Network.HTTP          ( Header(..), HeaderName(..), findHeader          , Request(..), RequestMethod(..), Response(..) )-import Network.TCP (HandleStream) import Network.URI (URI(uriPath), parseURI)  import Data.Char        (intToDigit)@@ -51,12 +49,7 @@                           else targetRepoURI{uriPath = uriPath targetRepoURI `FilePath.Posix.combine` "upload"}           Username username <- maybe promptUsername return mUsername           Password password <- maybe promptPassword return mPassword-          let auth = addAuthority AuthBasic {-                       auRealm    = "Hackage",-                       auUsername = username,-                       auPassword = password,-                       auSite     = uploadURI-                     }+          let auth = Just (username, password)           flip mapM_ paths $ \path -> do             notice verbosity $ "Uploading " ++ path ++ "... "             handlePackage verbosity uploadURI auth path@@ -82,17 +75,9 @@  report :: Verbosity -> [Repo] -> Maybe Username -> Maybe Password -> IO () report verbosity repos mUsername mPassword = do-      let uploadURI = if isOldHackageURI targetRepoURI-                      then legacyUploadURI-                      else targetRepoURI{uriPath = ""}       Username username <- maybe promptUsername return mUsername       Password password <- maybe promptPassword return mPassword-      let auth = addAuthority AuthBasic {-                   auRealm    = "Hackage",-                   auUsername = username,-                   auPassword = password,-                   auSite     = uploadURI-                 }+      let auth = Just (username, password)       forM_ repos $ \repo -> case repoKind repo of         Left remoteRepo             -> do dotCabal <- defaultCabalDir@@ -111,16 +96,14 @@                                     cabalBrowse verbosity auth $ BuildReport.uploadReports (remoteRepoURI remoteRepo) [(report', Just buildLog)]                                     return ()         Right{} -> return ()-  where-    targetRepoURI = remoteRepoURI $ last [ remoteRepo | Left remoteRepo <- map repoKind repos ] --FIXME: better error message when no repos are given  check :: Verbosity -> [FilePath] -> IO () check verbosity paths = do           flip mapM_ paths $ \path -> do             notice verbosity $ "Checking " ++ path ++ "... "-            handlePackage verbosity checkURI (return ()) path+            handlePackage verbosity checkURI Nothing path -handlePackage :: Verbosity -> URI -> BrowserAction (HandleStream String) ()+handlePackage :: Verbosity -> URI -> Maybe (String, String)               -> FilePath -> IO () handlePackage verbosity uri auth path =   do req <- mkRequest uri path

@@ -53,10 +53,10 @@ 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.11";  HTTP_VER_REGEXP="4000\.[012]\."         # == 4000.0.* || 4000.1.* || 4000.2.*+HTTP_VER="4000.2.16.1";  HTTP_VER_REGEXP="4000\.[012]\."         # == 4000.0.* || 4000.1.* || 4000.2.* ZLIB_VER="0.5.4.1";    ZLIB_VER_REGEXP="0\.[45]\."             # == 0.4.* || == 0.5.* TIME_VER="1.4.1";      TIME_VER_REGEXP="1\.[12345]\.?"         # >= 1.1 && < 1.6 RANDOM_VER="1.0.1.1";  RANDOM_VER_REGEXP="1\.0\."              # >= 1 && < 1.1

@@ -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