Hello community, here is the log from the commit of package ghc-HsOpenSSL for openSUSE:Factory checked in at 2017-05-06 18:27:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-HsOpenSSL (Old) and /work/SRC/openSUSE:Factory/.ghc-HsOpenSSL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-HsOpenSSL" Sat May 6 18:27:54 2017 rev:6 rq:491451 version:0.11.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-HsOpenSSL/ghc-HsOpenSSL.changes 2017-04-06 11:02:29.040752903 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-HsOpenSSL.new/ghc-HsOpenSSL.changes 2017-05-06 18:28:08.176055354 +0200 @@ -1,0 +2,5 @@ +Sun Apr 9 18:08:09 UTC 2017 - [email protected] + +- Update to version 0.11.4.6 with cabal2obs. + +------------------------------------------------------------------- Old: ---- HsOpenSSL-0.11.4.4.tar.gz New: ---- HsOpenSSL-0.11.4.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-HsOpenSSL.spec ++++++ --- /var/tmp/diff_new_pack.0oHorX/_old 2017-05-06 18:28:08.719978604 +0200 +++ /var/tmp/diff_new_pack.0oHorX/_new 2017-05-06 18:28:08.719978604 +0200 @@ -19,7 +19,7 @@ %global pkg_name HsOpenSSL %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.11.4.4 +Version: 0.11.4.6 Release: 0 Summary: Partial OpenSSL binding for Haskell License: SUSE-Public-Domain ++++++ HsOpenSSL-0.11.4.4.tar.gz -> HsOpenSSL-0.11.4.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsOpenSSL-0.11.4.4/ChangeLog new/HsOpenSSL-0.11.4.6/ChangeLog --- old/HsOpenSSL-0.11.4.4/ChangeLog 2017-03-23 23:44:20.000000000 +0100 +++ new/HsOpenSSL-0.11.4.6/ChangeLog 2017-04-05 17:17:17.000000000 +0200 @@ -1,3 +1,16 @@ +2017-04-05 Vladimir Shabanov <[email protected]> + + * HsOpenSSL.cabal (Version): Bump version to 0.11.4.6 + + * Setup.hs: builds with ghc 8.2, + by Erik de Castro Lopo @erikd (#22) + +2017-04-04 Vladimir Shabanov <[email protected]> + + * HsOpenSSL.cabal (Version): Bump version to 0.11.4.5 + + * cbits/HsOpenSSL.c: fixed HMAC_CTX_free invocation (#21) + 2017-03-24 Vladimir Shabanov <[email protected]> * HsOpenSSL.cabal (Version): Bump version to 0.11.4.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsOpenSSL-0.11.4.4/HsOpenSSL.cabal new/HsOpenSSL-0.11.4.6/HsOpenSSL.cabal --- old/HsOpenSSL-0.11.4.4/HsOpenSSL.cabal 2017-03-23 23:44:20.000000000 +0100 +++ new/HsOpenSSL-0.11.4.6/HsOpenSSL.cabal 2017-04-05 17:17:17.000000000 +0200 @@ -12,7 +12,7 @@ <http://hackage.haskell.org/package/tls>, which is a pure Haskell implementation of SSL. . -Version: 0.11.4.4 +Version: 0.11.4.6 License: PublicDomain License-File: COPYING Author: Adam Langley, Mikhail Vorozhtsov, PHO, Taru Karttunen @@ -66,7 +66,7 @@ base >= 4.4 && < 5, bytestring >= 0.9 && < 0.11, network >= 2.1 && < 2.7, - time >= 1.5 && < 1.7 + time >= 1.5 && < 1.9 if flag(fast-bignum) && impl(ghc >= 7.10.1) -- only new integer-gmp 1.0.0 is supported diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsOpenSSL-0.11.4.4/Setup.hs new/HsOpenSSL-0.11.4.6/Setup.hs --- old/HsOpenSSL-0.11.4.4/Setup.hs 2017-03-23 23:44:20.000000000 +0100 +++ new/HsOpenSSL-0.11.4.6/Setup.hs 2017-04-05 17:17:17.000000000 +0200 @@ -1,11 +1,16 @@ -#!/usr/bin/env runghc - +{-# LANGUAGE CPP #-} {-# LANGUAGE TupleSections #-} import Distribution.Simple import Distribution.Simple.Setup (ConfigFlags(..), toFlag) import Distribution.Simple.LocalBuildInfo (localPkgDescr) + +#if __GLASGOW_HASKELL__ >= 802 +import Distribution.PackageDescription (FlagName(..), mkFlagName) +#else import Distribution.PackageDescription (FlagName(..)) +#endif + import Distribution.Verbosity (silent) import System.Info (os) import qualified Control.Exception as E (tryJust, throw) @@ -36,13 +41,13 @@ Right lbi -> return lbi -- library was found Left e | configConfigurationsFlags cfg - `intersect` [(FlagName f, True) | f <- flags] /= [] -> + `intersect` [(mkFlagName f, True) | f <- flags] /= [] -> E.throw e -- flag was set but library still wasn't found | otherwise -> do r <- forM flags $ \ f -> fmap (f,) $ tryConfig descr $ - setFlag f cfg { configVerbosity = toFlag silent } + setFlag (mkFlagName f) cfg { configVerbosity = toFlag silent } -- TODO: configure is a long operation -- while checkForeignDeps is fast. -- Perhaps there is a way to configure once @@ -57,21 +62,23 @@ fs -> fail $ multipleFound fs -notFound = - "Can't find OpenSSL library,\n\ - \install it via 'brew install openssl' or 'port install openssl'\n\ - \or use --extra-include-dirs= and --extra-lib-dirs=\n\ - \to specify location of installed OpenSSL library." - -multipleFound fs = - "Multiple OpenSSL libraries were found,\n\ - \use " ++ intercalate " or " ["'-f " ++ f ++ "'" | (f,_) <- fs] ++ "\n\ - \to specify location of installed OpenSSL library." +notFound = unlines + [ "Can't find OpenSSL library," + , "install it via 'brew install openssl' or 'port install openssl'" + , "or use --extra-include-dirs= and --extra-lib-dirs=" + , "to specify location of installed OpenSSL library." + ] + +multipleFound fs = unlines + [ "Multiple OpenSSL libraries were found," + , "use " ++ intercalate " or " ["'-f " ++ f ++ "'" | (f,_) <- fs] + , "to specify location of installed OpenSSL library." + ] setFlag f c = c { configConfigurationsFlags = go (configConfigurationsFlags c) } where go [] = [] - go (x@(FlagName n, _):xs) - | n == f = (FlagName f, True) : xs + go (x@(n, _):xs) + | n == f = (f, True) : xs | otherwise = x : go xs tryConfig descr flags = do @@ -90,3 +97,8 @@ where ue e | isUserError e = Just e | otherwise = Nothing + +#if __GLASGOW_HASKELL__ < 802 +mkFlagName = FlagName +#endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsOpenSSL-0.11.4.4/cbits/HsOpenSSL.c new/HsOpenSSL-0.11.4.6/cbits/HsOpenSSL.c --- old/HsOpenSSL-0.11.4.4/cbits/HsOpenSSL.c 2017-03-23 23:44:20.000000000 +0100 +++ new/HsOpenSSL-0.11.4.6/cbits/HsOpenSSL.c 2017-04-05 17:17:17.000000000 +0200 @@ -83,7 +83,7 @@ void HsOpenSSL_HMAC_CTX_free(HMAC_CTX *ctx) { #if OPENSSL_VERSION_NUMBER >= 0x10100000L - return HMAC_CTX_free(); + HMAC_CTX_free(ctx); #else HMAC_CTX_cleanup(ctx); free(ctx);
