Date: Tuesday, July 5, 2016 @ 09:33:23 Author: felixonmars Revision: 182290
upgpkg: haskell-authenticate 1.3.3.2-1 rebuild with aeson-compat-0.3.5.0, authenticate-1.3.3.2, chunked-data-0.3.0, conduit-combinators-1.0.4, conduit-extra-1.1.13.2, http-client-0.5.0, http-client-tls-0.3.0, http-conduit-2.2.0, monad-logger-0.3.19, mono-traversable-1.0.0, wai-extra-3.0.15.3, wai-logger-2.3.0, warp-3.2.7 Modified: haskell-authenticate/trunk/PKGBUILD Deleted: haskell-authenticate/trunk/http-conduit-2.2.patch ------------------------+ PKGBUILD | 15 ++++----------- http-conduit-2.2.patch | 15 --------------- 2 files changed, 4 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-07-05 09:19:56 UTC (rev 182289) +++ PKGBUILD 2016-07-05 09:33:23 UTC (rev 182290) @@ -4,8 +4,8 @@ _hkgname=authenticate pkgname=haskell-authenticate -pkgver=1.3.3.1 -pkgrel=20 +pkgver=1.3.3.2 +pkgrel=1 pkgdesc="Authentication methods for Haskell web applications." url="http://github.com/yesodweb/authenticate"; license=("MIT") @@ -15,16 +15,9 @@ "haskell-http-types" "haskell-monad-control" "haskell-network-uri" "haskell-resourcet" "haskell-tagstream-conduit" "haskell-text" "haskell-unordered-containers" "haskell-xml-conduit") -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"; - http-conduit-2.2.patch) -sha256sums=('652449f41b12a71f570fd84f53893f82e50b7d793a0724d349188ce19d623113' - 'c46ba93545d50d52c5cf4bea9f4e494a57cf5dfb4a2c4d86c0bc473ea4b7bfc9') +source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";) +sha256sums=('a65ff7791e646ea847fc6b8369addeecf6d2c3055a0b7ebe1421881103656e30') -prepare() { - cd "${srcdir}/${_hkgname}-${pkgver}" - patch -p2 -i ../http-conduit-2.2.patch -} - build() { cd "${srcdir}/${_hkgname}-${pkgver}" Deleted: http-conduit-2.2.patch =================================================================== --- http-conduit-2.2.patch 2016-07-05 09:19:56 UTC (rev 182289) +++ http-conduit-2.2.patch 2016-07-05 09:33:23 UTC (rev 182290) @@ -1,15 +0,0 @@ -diff --git a/authenticate/OpenId2/Discovery.hs b/authenticate/OpenId2/Discovery.hs -index 8b3f63f..0db3b17 100644 ---- a/authenticate/OpenId2/Discovery.hs -+++ b/authenticate/OpenId2/Discovery.hs -@@ -81,7 +81,9 @@ discoverYADIS ident mb_loc redirects manager = do - let uri = fromMaybe (unpack $ identifier ident) mb_loc - req <- liftIO $ parseUrl uri - res <- httpLbs req --#if MIN_VERSION_http_conduit(1, 9, 0) -+#if MIN_VERSION_http_conduit(2, 2, 0) -+ { checkResponse = \_ _ -> return () -+#elif MIN_VERSION_http_conduit(1, 9, 0) - { checkStatus = \_ _ _ -> Nothing - #else - { checkStatus = \_ _ -> Nothing
