commit ghc-cryptonite-openssl for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-cryptonite-openssl for
openSUSE:Factory checked in at 2017-09-15 21:29:51
Comparing /work/SRC/openSUSE:Factory/ghc-cryptonite-openssl (Old)
and /work/SRC/openSUSE:Factory/.ghc-cryptonite-openssl.new (New)
Package is "ghc-cryptonite-openssl"
Fri Sep 15 21:29:51 2017 rev:3 rq:524363 version:0.6
Changes:
---
/work/SRC/openSUSE:Factory/ghc-cryptonite-openssl/ghc-cryptonite-openssl.changes
2017-08-31 20:50:27.793983601 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-cryptonite-openssl.new/ghc-cryptonite-openssl.changes
2017-09-15 21:29:52.586818671 +0200
@@ -1,0 +2,5 @@
+Thu Aug 3 15:38:38 UTC 2017 - psim...@suse.com
+
+- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf.
+
+---
Other differences:
--
++ ghc-cryptonite-openssl.spec ++
--- /var/tmp/diff_new_pack.oIKF5k/_old 2017-09-15 21:29:53.650668743 +0200
+++ /var/tmp/diff_new_pack.oIKF5k/_new 2017-09-15 21:29:53.654668179 +0200
@@ -23,8 +23,8 @@
Release:0
Summary:Crypto stuff using OpenSSL cryptographic library
License:BSD-3-Clause
-Group: Development/Languages/Other
-Url:https://hackage.haskell.org/package/%{pkg_name}
+Group: Development/Libraries/Haskell
+URL:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-bytestring-devel
@@ -32,7 +32,6 @@
BuildRequires: ghc-memory-devel
BuildRequires: ghc-rpm-macros
BuildRequires: libopenssl-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-tasty-devel
BuildRequires: ghc-tasty-hunit-devel
@@ -45,7 +44,7 @@
%package devel
Summary:Haskell %{pkg_name} library development files
-Group: Development/Libraries/Other
+Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires: libopenssl-devel
@@ -75,11 +74,9 @@
%ghc_pkg_recache
%files -f %{name}.files
-%defattr(-,root,root,-)
%doc LICENSE
%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
%doc README.md
%changelog
commit ghc-cryptonite-openssl for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-cryptonite-openssl for
openSUSE:Factory checked in at 2017-08-31 20:50:23
Comparing /work/SRC/openSUSE:Factory/ghc-cryptonite-openssl (Old)
and /work/SRC/openSUSE:Factory/.ghc-cryptonite-openssl.new (New)
Package is "ghc-cryptonite-openssl"
Thu Aug 31 20:50:23 2017 rev:2 rq:513226 version:0.6
Changes:
---
/work/SRC/openSUSE:Factory/ghc-cryptonite-openssl/ghc-cryptonite-openssl.changes
2017-04-11 09:47:14.143514609 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-cryptonite-openssl.new/ghc-cryptonite-openssl.changes
2017-08-31 20:50:27.793983601 +0200
@@ -1,0 +2,5 @@
+Thu Jul 27 14:08:11 UTC 2017 - psim...@suse.com
+
+- Update to version 0.6.
+
+---
Old:
cryptonite-openssl-0.5.tar.gz
New:
cryptonite-openssl-0.6.tar.gz
Other differences:
--
++ ghc-cryptonite-openssl.spec ++
--- /var/tmp/diff_new_pack.S4HIVF/_old 2017-08-31 20:50:28.833837637 +0200
+++ /var/tmp/diff_new_pack.S4HIVF/_new 2017-08-31 20:50:28.837837076 +0200
@@ -19,7 +19,7 @@
%global pkg_name cryptonite-openssl
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:0.5
+Version:0.6
Release:0
Summary:Crypto stuff using OpenSSL cryptographic library
License:BSD-3-Clause
++ cryptonite-openssl-0.5.tar.gz -> cryptonite-openssl-0.6.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cryptonite-openssl-0.5/Crypto/OpenSSL/AES/Foreign.hsc
new/cryptonite-openssl-0.6/Crypto/OpenSSL/AES/Foreign.hsc
--- old/cryptonite-openssl-0.5/Crypto/OpenSSL/AES/Foreign.hsc 2016-11-21
13:06:04.0 +0100
+++ new/cryptonite-openssl-0.6/Crypto/OpenSSL/AES/Foreign.hsc 2017-05-13
12:37:47.0 +0200
@@ -5,20 +5,31 @@
#include
#include
-#if OPENSSL_VERSION_NUMBER > 0x10001000
+#if OPENSSL_VERSION_NUMBER >= 0x1010
+#define OPENSSL_HAS_OPAQUE_EVP_CIPHER_CTX
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= 0x10001000
#define OPENSSL_HAS_PBKDF2
#define OPENSSL_HAS_GCM
#endif
+import Foreign.Marshal.Alloc
import Foreign.Ptr
+import Foreign.ForeignPtr
import Foreign.C.Types
import Data.Word
+#ifndef OPENSSL_HAS_OPAQUE_EVP_CIPHER_CTX
+import qualified Data.Memory.PtrMethods as B (memSet)
+#endif
gcmTagLength :: Int
gcmTagLength = 16
+#ifndef OPENSSL_HAS_OPAQUE_EVP_CIPHER_CTX
sizeofEVP :: Int
sizeofEVP = (#const sizeof(EVP_CIPHER_CTX))
+#endif
data ENGINE
@@ -32,14 +43,33 @@
type OutputOffset = Ptr CInt
type InputLength = CInt
+compatNewEvpCipherCtx :: IO (ForeignPtr EVP_CIPHER_CTX)
+compatNewEvpCipherCtx = do
+#ifdef OPENSSL_HAS_OPAQUE_EVP_CIPHER_CTX
+ptr <- ssl_c_cipher_ctx_new
+newForeignPtr ssl_c_cipher_ctx_free ptr
+#else
+ptr <- mallocBytes sizeofEVP
+B.memSet (castPtr ptr) 0 (fromIntegral sizeofEVP)
+ssl_c_cipher_ctx_init ptr
+newForeignPtr ssl_c_cipher_ctx_cleanup ptr
+#endif
+
+#ifdef OPENSSL_HAS_OPAQUE_EVP_CIPHER_CTX
+foreign import ccall unsafe "EVP_CIPHER_CTX_new"
+ssl_c_cipher_ctx_new :: IO (Ptr EVP_CIPHER_CTX)
+#endif
+
foreign import ccall unsafe "EVP_CIPHER_CTX_init"
ssl_c_cipher_ctx_init :: Ptr EVP_CIPHER_CTX -> IO ()
foreign import ccall unsafe "_CIPHER_CTX_free"
ssl_c_cipher_ctx_free :: FunPtr (Ptr EVP_CIPHER_CTX -> IO ())
+#ifndef OPENSSL_HAS_OPAQUE_EVP_CIPHER_CTX
foreign import ccall unsafe "_CIPHER_CTX_cleanup"
ssl_c_cipher_ctx_cleanup :: FunPtr (Ptr EVP_CIPHER_CTX -> IO ())
+#endif
foreign import ccall unsafe "EVP_CIPHER_CTX_ctrl"
ssl_c_cipher_ctx_ctrl :: Ptr EVP_CIPHER_CTX -> CInt -> CInt -> Ptr a -> IO
CInt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cryptonite-openssl-0.5/Crypto/OpenSSL/AES.hs
new/cryptonite-openssl-0.6/Crypto/OpenSSL/AES.hs
--- old/cryptonite-openssl-0.5/Crypto/OpenSSL/AES.hs2016-11-21
13:06:04.0 +0100
+++ new/cryptonite-openssl-0.6/Crypto/OpenSSL/AES.hs2017-05-13
12:37:47.0 +0200
@@ -27,7 +27,6 @@
import Foreign.Storable
import Data.ByteString (ByteString)
import qualified Data.ByteArray as B
-import qualified Data.Memory.PtrMethods as B (memSet)
type GCMCtx = ForeignPtr EVP_CIPHER_CTX
@@ -116,10 +115,9 @@
contextNew :: (Ptr EVP_CIPHER_CTX -> IO ()) -> IO GCMCtx
contextNew f = do
-ptr <- mallocBytes sizeofEVP
-B.memSet (castPtr ptr) 0 (fromIntegral sizeofEVP)
-f ptr
-newForeignPtr ssl_c_cipher_ctx_cleanup ptr
+fptr <- compatNewEvpCipherCtx
+withForeignPtr fptr f
+return fptr
nullEngine :: Ptr ENGINE
nullEngine = nullPtr
diff -urN '--exclude=CVS' '--exclude=.cvsignore'
commit ghc-cryptonite-openssl for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-cryptonite-openssl for
openSUSE:Factory checked in at 2017-04-11 09:47:11
Comparing /work/SRC/openSUSE:Factory/ghc-cryptonite-openssl (Old)
and /work/SRC/openSUSE:Factory/.ghc-cryptonite-openssl.new (New)
Package is "ghc-cryptonite-openssl"
Tue Apr 11 09:47:11 2017 rev:1 rq:486488 version:0.5
Changes:
New Changes file:
--- /dev/null 2017-03-01 00:40:19.279048016 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-cryptonite-openssl.new/ghc-cryptonite-openssl.changes
2017-04-11 09:47:14.143514609 +0200
@@ -0,0 +1,5 @@
+---
+Sun Feb 12 10:08:29 UTC 2017 - psim...@suse.com
+
+- Update to version 0.5 with cabal2obs.
+
New:
cryptonite-openssl-0.5.tar.gz
ghc-cryptonite-openssl.changes
ghc-cryptonite-openssl.spec
Other differences:
--
++ ghc-cryptonite-openssl.spec ++
#
# spec file for package ghc-cryptonite-openssl
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%global pkg_name cryptonite-openssl
%bcond_with tests
Name: ghc-%{pkg_name}
Version:0.5
Release:0
Summary:Crypto stuff using OpenSSL cryptographic library
License:BSD-3-Clause
Group: Development/Languages/Other
Url:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-cryptonite-devel
BuildRequires: ghc-memory-devel
BuildRequires: ghc-rpm-macros
BuildRequires: libopenssl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-tasty-devel
BuildRequires: ghc-tasty-hunit-devel
BuildRequires: ghc-tasty-kat-devel
BuildRequires: ghc-tasty-quickcheck-devel
%endif
%description
Support for OpenSSL based crypto operations in Haskell, as a bolt-in to
'cryptonite'.
%package devel
Summary:Haskell %{pkg_name} library development files
Group: Development/Libraries/Other
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires: libopenssl-devel
Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
%description devel
This package provides the Haskell %{pkg_name} library development
files.
%prep
%setup -q -n %{pkg_name}-%{version}
%build
%ghc_lib_build
%install
%ghc_lib_install
%check
%cabal_test
%post devel
%ghc_pkg_recache
%postun devel
%ghc_pkg_recache
%files -f %{name}.files
%defattr(-,root,root,-)
%doc LICENSE
%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%doc README.md
%changelog
