Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-lukko for openSUSE:Factory checked in at 2021-01-20 18:25:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-lukko (Old) and /work/SRC/openSUSE:Factory/.ghc-lukko.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-lukko" Wed Jan 20 18:25:22 2021 rev:6 rq:863270 version:0.1.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-lukko/ghc-lukko.changes 2020-12-22 11:42:24.313666531 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-lukko.new.28504/ghc-lukko.changes 2021-01-20 18:25:50.215427166 +0100 @@ -1,0 +2,13 @@ +Fri Jan 8 08:27:25 UTC 2021 - [email protected] + +- Update lukko to version 0.1.1.3. + # 0.1.1.3 + + * Use `CApiFFI` to call varargs C functions. + * Define `let alignment` only when needed. + + # 0.1.1.2 + + * Make Win32 code more idiomatic + +------------------------------------------------------------------- Old: ---- lukko-0.1.1.2.tar.gz New: ---- lukko-0.1.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-lukko.spec ++++++ --- /var/tmp/diff_new_pack.rPwQxZ/_old 2021-01-20 18:25:51.455428346 +0100 +++ /var/tmp/diff_new_pack.rPwQxZ/_new 2021-01-20 18:25:51.459428350 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-lukko # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name lukko %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.1.2 +Version: 0.1.1.3 Release: 0 Summary: File locking License: GPL-2.0-or-later AND BSD-3-Clause ++++++ lukko-0.1.1.2.tar.gz -> lukko-0.1.1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lukko-0.1.1.2/CHANGELOG.md new/lukko-0.1.1.3/CHANGELOG.md --- old/lukko-0.1.1.2/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/lukko-0.1.1.3/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,12 @@ +# 0.1.1.3 + +* Use `CApiFFI` to call varargs C functions. +* Define `let alignment` only when needed. + +# 0.1.1.2 + +* Make Win32 code more idiomatic + # 0.1.1.1 - Add proper `Setup.hs` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lukko-0.1.1.2/lukko.cabal new/lukko-0.1.1.3/lukko.cabal --- old/lukko-0.1.1.2/lukko.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/lukko-0.1.1.3/lukko.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: 2.2 name: lukko -version: 0.1.1.2 +version: 0.1.1.3 synopsis: File locking category: System, Concurrency description: @@ -41,7 +41,11 @@ maintainer: Oleg Grenrus <[email protected]> license: GPL-2.0-or-later AND BSD-3-Clause -license-files: LICENSE LICENSE.GPLv2 LICENSE.GPLv3 +license-files: + LICENSE + LICENSE.GPLv2 + LICENSE.GPLv3 + build-type: Simple extra-source-files: CHANGELOG.md tested-with: @@ -52,12 +56,12 @@ || ==8.2.2 || ==8.4.4 || ==8.6.5 - || ==8.8.3 - || ==8.10.1 + || ==8.8.4 + || ==8.10.3 source-repository head type: git - location: https://github.com/phadej/lukko/ + location: https://github.com/haskellari/lukko/ flag ofd-locking default: True @@ -120,8 +124,8 @@ , filepath ^>=1.3.0.0 || ^>=1.4.0.0 , lukko , singleton-bool ^>=0.1.5 - , tasty ^>=1.2.3 - , tasty-expected-failure ^>=0.11.1.2 + , tasty ^>=1.4.0.1 + , tasty-expected-failure ^>=0.11.1.2 || ^>=0.12.2 , tasty-hunit ^>=0.10.0.2 , temporary ^>=1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lukko-0.1.1.2/src/Lukko/Internal/Types.hs new/lukko-0.1.1.3/src/Lukko/Internal/Types.hs --- old/lukko-0.1.1.2/src/Lukko/Internal/Types.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/lukko-0.1.1.3/src/Lukko/Internal/Types.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,9 +1,9 @@ {-# LANGUAGE DeriveDataTypeable #-} -{-# LANGUAGE Safe #-} +{-# LANGUAGE Safe #-} module Lukko.Internal.Types where import Control.Exception (Exception) -import Data.Typeable (Typeable) +import Data.Typeable (Typeable) -- | Exception thrown by 'hLock' on non-Windows platforms that don't support -- @flock@. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lukko-0.1.1.2/src/Lukko/NoOp.hs new/lukko-0.1.1.3/src/Lukko/NoOp.hs --- old/lukko-0.1.1.2/src/Lukko/NoOp.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/lukko-0.1.1.3/src/Lukko/NoOp.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ {-# LANGUAGE DataKinds #-} -{-# LANGUAGE Safe #-} +{-# LANGUAGE Safe #-} -- | Non-operating locks. -- -- All functions throw 'FileLockingNotImplemented'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lukko-0.1.1.2/src-ofd/Lukko/OFD.hsc new/lukko-0.1.1.3/src-ofd/Lukko/OFD.hsc --- old/lukko-0.1.1.2/src-ofd/Lukko/OFD.hsc 2001-09-09 03:46:40.000000000 +0200 +++ new/lukko-0.1.1.3/src-ofd/Lukko/OFD.hsc 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,4 @@ +{-# LANGUAGE CApiFFI #-} {-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE InterruptibleFFI #-} @@ -110,13 +111,25 @@ ------------------------------------------------------------------------------- -- there is no alignment in old hsc2hs -#let alignmentcompat t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__) +#if defined(MIN_TOOL_VERSION_hsc2hs) +#if !MIN_TOOL_VERSION_hsc2hs(0,68,7) +#define HAS_NO_ALIGNMENT 1 +#endif +#else +-- if run directly (cabal sets MIN_TOOL_VERSION_hsc2hs macro) +-- assume the worst. +#define HAS_NO_ALIGNMENT 1 +#endif + +#ifdef HAS_NO_ALIGNMENT +#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__) +#endif ------------------------------------------------------------------------------- -- implementation ------------------------------------------------------------------------------- -foreign import ccall interruptible "fcntl" +foreign import capi interruptible "fcntl.h fcntl" c_fcntl :: CInt -> CInt -> Ptr FLock -> IO CInt data FLock = FLock { l_type :: CShort @@ -128,7 +141,7 @@ instance Storable FLock where sizeOf _ = #{size struct flock} - alignment _ = #{alignmentcompat struct flock} + alignment _ = #{alignment struct flock} poke ptr x = do fillBytes ptr 0 (sizeOf x) #{poke struct flock, l_type} ptr (l_type x) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lukko-0.1.1.2/src-unix/Lukko/Internal/FD.hsc new/lukko-0.1.1.3/src-unix/Lukko/Internal/FD.hsc --- old/lukko-0.1.1.2/src-unix/Lukko/Internal/FD.hsc 2001-09-09 03:46:40.000000000 +0200 +++ new/lukko-0.1.1.3/src-unix/Lukko/Internal/FD.hsc 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,4 @@ +{-# LANGUAGE CApiFFI #-} {-# LANGUAGE CPP #-} {-# LANGUAGE InterruptibleFFI #-} {-# LANGUAGE Trustworthy #-} @@ -27,7 +28,7 @@ -- This is a wrapper over 'CInt' newtype FD = FD CInt -foreign import ccall interruptible "open" +foreign import capi interruptible "fcntl.h open" c_open :: CString -> CInt -> CMode -> IO CInt foreign import ccall interruptible "close"
