commit ghc-x509-system for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509-system for openSUSE:Factory
checked in at 2020-08-28 21:41:27
Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509-system.new.3399 (New)
Package is "ghc-x509-system"
Fri Aug 28 21:41:27 2020 rev:13 rq:829500 version:1.6.6
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes
2020-06-19 17:21:20.467533438 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-x509-system.new.3399/ghc-x509-system.changes
2020-08-28 21:41:29.292889697 +0200
@@ -1,0 +2,5 @@
+Tue Aug 18 10:46:41 UTC 2020 - Peter Simons
+
+- Replace %setup -q with the more modern %autosetup macro.
+
+---
Other differences:
--
++ ghc-x509-system.spec ++
--- /var/tmp/diff_new_pack.PEVzoo/_old 2020-08-28 21:41:30.052889977 +0200
+++ /var/tmp/diff_new_pack.PEVzoo/_new 2020-08-28 21:41:30.052889977 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-x509-system
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -50,7 +50,7 @@
This package provides the Haskell %{pkg_name} library development files.
%prep
-%setup -q -n %{pkg_name}-%{version}
+%autosetup -n %{pkg_name}-%{version}
%build
%ghc_lib_build
commit ghc-x509-system for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-x509-system for openSUSE:Factory checked in at 2020-06-19 17:21:16 Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old) and /work/SRC/openSUSE:Factory/.ghc-x509-system.new.3606 (New) Package is "ghc-x509-system" Fri Jun 19 17:21:16 2020 rev:12 rq:815220 version:1.6.6 Changes: --- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes 2019-12-27 13:59:15.348828988 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-x509-system.new.3606/ghc-x509-system.changes 2020-06-19 17:21:20.467533438 +0200 @@ -1,0 +2,5 @@ +Tue Jun 16 11:14:52 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +--- Other differences: -- ++ ghc-x509-system.spec ++ --- /var/tmp/diff_new_pack.siiQbL/_old 2020-06-19 17:21:21.075535240 +0200 +++ /var/tmp/diff_new_pack.siiQbL/_new 2020-06-19 17:21:21.075535240 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-x509-system # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed
commit ghc-x509-system for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509-system for openSUSE:Factory
checked in at 2019-12-27 13:59:12
Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509-system.new.6675 (New)
Package is "ghc-x509-system"
Fri Dec 27 13:59:12 2019 rev:11 rq:759562 version:1.6.6
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes
2018-10-25 09:07:34.098461029 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-x509-system.new.6675/ghc-x509-system.changes
2019-12-27 13:59:15.348828988 +0100
@@ -1,0 +2,5 @@
+Fri Nov 8 16:15:14 UTC 2019 - Peter Simons
+
+- Drop obsolete group attributes.
+
+---
Other differences:
--
++ ghc-x509-system.spec ++
--- /var/tmp/diff_new_pack.081IHz/_old 2019-12-27 13:59:15.952829280 +0100
+++ /var/tmp/diff_new_pack.081IHz/_new 2019-12-27 13:59:15.956829282 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-x509-system
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -22,7 +22,6 @@
Release:0
Summary:Handle per-operating-system X.509 accessors and storage
License:BSD-3-Clause
-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
@@ -42,7 +41,6 @@
%package devel
Summary:Haskell %{pkg_name} library development files
-Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
commit ghc-x509-system for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-x509-system for openSUSE:Factory checked in at 2018-10-25 09:07:30 Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old) and /work/SRC/openSUSE:Factory/.ghc-x509-system.new (New) Package is "ghc-x509-system" Thu Oct 25 09:07:30 2018 rev:10 rq:643493 version:1.6.6 Changes: --- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes 2018-07-21 10:24:32.034967450 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-x509-system.new/ghc-x509-system.changes 2018-10-25 09:07:34.098461029 +0200 @@ -1,0 +2,5 @@ +Sat Oct 20 11:32:15 UTC 2018 - Peter Simons + +- Use https URL to refer to bugs.opensuse.org. + +--- Other differences: -- ++ ghc-x509-system.spec ++ --- /var/tmp/diff_new_pack.PtKR0k/_old 2018-10-25 09:07:34.558460754 +0200 +++ /var/tmp/diff_new_pack.PtKR0k/_new 2018-10-25 09:07:34.562460752 +0200 @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ #
commit ghc-x509-system for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-x509-system for openSUSE:Factory checked in at 2018-07-21 10:24:30 Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old) and /work/SRC/openSUSE:Factory/.ghc-x509-system.new (New) Package is "ghc-x509-system" Sat Jul 21 10:24:30 2018 rev:9 rq:623897 version:1.6.6 Changes: --- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes 2018-05-30 12:27:57.272918165 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-x509-system.new/ghc-x509-system.changes 2018-07-21 10:24:32.034967450 +0200 @@ -1,0 +2,6 @@ +Wed Jul 18 14:26:48 UTC 2018 - psim...@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + +--- @@ -41 +46,0 @@ - Other differences: --
commit ghc-x509-system for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509-system for openSUSE:Factory
checked in at 2018-05-30 12:16:00
Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509-system.new (New)
Package is "ghc-x509-system"
Wed May 30 12:16:00 2018 rev:8 rq:607927 version:1.6.6
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes
2017-08-31 21:01:52.405809896 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509-system.new/ghc-x509-system.changes
2018-05-30 12:27:57.272918165 +0200
@@ -1,0 +2,6 @@
+Mon May 14 17:02:11 UTC 2018 - psim...@suse.com
+
+- Update x509-system to version 1.6.6.
+ Upstream does not provide a changelog.
+
+---
Old:
x509-system-1.6.5.tar.gz
New:
x509-system-1.6.6.tar.gz
Other differences:
--
++ ghc-x509-system.spec ++
--- /var/tmp/diff_new_pack.i5lFWT/_old 2018-05-30 12:27:57.968893628 +0200
+++ /var/tmp/diff_new_pack.i5lFWT/_new 2018-05-30 12:27:57.972893488 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-x509-system
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -18,12 +18,12 @@
%global pkg_name x509-system
Name: ghc-%{pkg_name}
-Version:1.6.5
+Version:1.6.6
Release:0
Summary:Handle per-operating-system X.509 accessors and storage
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
@@ -36,14 +36,13 @@
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-x509-devel
BuildRequires: ghc-x509-store-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
System X.509 handling.
%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(post): ghc-compiler = %{ghc_version}
@@ -68,10 +67,8 @@
%ghc_pkg_recache
%files -f %{name}.files
-%defattr(-,root,root,-)
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
%changelog
++ x509-system-1.6.5.tar.gz -> x509-system-1.6.6.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-system-1.6.5/System/X509/MacOS.hs
new/x509-system-1.6.6/System/X509/MacOS.hs
--- old/x509-system-1.6.5/System/X509/MacOS.hs 2015-06-19 22:19:18.0
+0200
+++ new/x509-system-1.6.6/System/X509/MacOS.hs 2017-07-31 22:17:24.0
+0200
@@ -1,6 +1,6 @@
module System.X509.MacOS
- ( getSystemCertificateStore
- ) where
+( getSystemCertificateStore
+) where
import Data.PEM (pemParseLBS, PEM(..))
import System.Process
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-system-1.6.5/System/X509.hs
new/x509-system-1.6.6/System/X509.hs
--- old/x509-system-1.6.5/System/X509.hs2014-10-09 06:25:42.0
+0200
+++ new/x509-system-1.6.6/System/X509.hs2017-07-31 22:17:24.0
+0200
@@ -7,8 +7,8 @@
-- Portability : good
--
module System.X509
- ( getSystemCertificateStore
- ) where
+( getSystemCertificateStore
+) where
#if defined(WINDOWS)
import System.X509.Win32
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-system-1.6.5/x509-system.cabal
new/x509-system-1.6.6/x509-system.cabal
--- old/x509-system-1.6.5/x509-system.cabal 2017-07-21 19:18:45.0
+0200
+++ new/x509-system-1.6.6/x509-system.cabal 2017-07-31 22:24:06.0
+0200
@@ -1,5 +1,5 @@
Name:x509-system
-version: 1.6.5
+version: 1.6.6
Description: System X.509 handling
License: BSD3
License-file:LICENSE
commit ghc-x509-system for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509-system for openSUSE:Factory
checked in at 2017-08-31 21:01:52
Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509-system.new (New)
Package is "ghc-x509-system"
Thu Aug 31 21:01:52 2017 rev:7 rq:513542 version:1.6.5
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes
2016-11-05 21:27:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-x509-system.new/ghc-x509-system.changes
2017-08-31 21:01:52.405809896 +0200
@@ -1,0 +2,5 @@
+Thu Jul 27 14:07:15 UTC 2017 - psim...@suse.com
+
+- Update to version 1.6.5.
+
+---
Old:
x509-system-1.6.4.tar.gz
New:
x509-system-1.6.5.tar.gz
Other differences:
--
++ ghc-x509-system.spec ++
--- /var/tmp/diff_new_pack.i3zrRO/_old 2017-08-31 21:01:53.925596362 +0200
+++ /var/tmp/diff_new_pack.i3zrRO/_new 2017-08-31 21:01:53.949592991 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-x509-system
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# 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
@@ -18,7 +18,7 @@
%global pkg_name x509-system
Name: ghc-%{pkg_name}
-Version:1.6.4
+Version:1.6.5
Release:0
Summary:Handle per-operating-system X.509 accessors and storage
License:BSD-3-Clause
++ x509-system-1.6.4.tar.gz -> x509-system-1.6.5.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-system-1.6.4/x509-system.cabal
new/x509-system-1.6.5/x509-system.cabal
--- old/x509-system-1.6.4/x509-system.cabal 2016-10-03 09:47:13.0
+0200
+++ new/x509-system-1.6.5/x509-system.cabal 2017-07-21 19:18:45.0
+0200
@@ -1,5 +1,5 @@
Name:x509-system
-Version: 1.6.4
+version: 1.6.5
Description: System X.509 handling
License: BSD3
License-file:LICENSE
@@ -11,9 +11,10 @@
Category:Data
stability: experimental
Homepage:http://github.com/vincenthz/hs-certificate
-Cabal-Version: >=1.8
+Cabal-Version: >= 1.10
Library
+ Default-Language: Haskell2010
Build-Depends: base >= 3 && < 5
, bytestring
, mtl
@@ -22,8 +23,8 @@
, filepath
, process
, pem >= 0.1 && < 0.3
- , x509 >= 1.6 && < 1.7
- , x509-store >= 1.6.2 && < 1.7
+ , x509 >= 1.6
+ , x509-store >= 1.6.2
Exposed-modules: System.X509
System.X509.Unix
System.X509.MacOS
commit ghc-x509-system for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509-system for openSUSE:Factory
checked in at 2016-11-05 21:27:04
Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509-system.new (New)
Package is "ghc-x509-system"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes
2016-07-20 09:20:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509-system.new/ghc-x509-system.changes
2016-11-05 21:27:05.0 +0100
@@ -1,0 +2,5 @@
+Tue Oct 11 08:49:30 UTC 2016 - psim...@suse.com
+
+- Update to version 1.6.4 with cabal2obs.
+
+---
Old:
x509-system-1.6.3.tar.gz
New:
x509-system-1.6.4.tar.gz
Other differences:
--
++ ghc-x509-system.spec ++
--- /var/tmp/diff_new_pack.gqumoF/_old 2016-11-05 21:27:06.0 +0100
+++ /var/tmp/diff_new_pack.gqumoF/_new 2016-11-05 21:27:06.0 +0100
@@ -18,15 +18,14 @@
%global pkg_name x509-system
Name: ghc-%{pkg_name}
-Version:1.6.3
+Version:1.6.4
Release:0
Summary:Handle per-operating-system X.509 accessors and storage
License:BSD-3-Clause
-Group: System/Libraries
+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
-# Begin cabal-rpm deps:
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-directory-devel
@@ -38,7 +37,6 @@
BuildRequires: ghc-x509-devel
BuildRequires: ghc-x509-store-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# End cabal-rpm deps
%description
System X.509 handling.
@@ -57,15 +55,12 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%post devel
%ghc_pkg_recache
++ x509-system-1.6.3.tar.gz -> x509-system-1.6.4.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-system-1.6.3/System/X509/Unix.hs
new/x509-system-1.6.4/System/X509/Unix.hs
--- old/x509-system-1.6.3/System/X509/Unix.hs 2015-12-19 09:08:49.0
+0100
+++ new/x509-system-1.6.4/System/X509/Unix.hs 2016-10-03 09:36:01.0
+0200
@@ -16,22 +16,12 @@
( getSystemCertificateStore
) where
-import System.Directory (getDirectoryContents, doesFileExist,
doesDirectoryExist)
import System.Environment (getEnv)
-import System.FilePath (())
-
-import Data.List (isPrefixOf)
-import Data.PEM (PEM(..), pemParseBS)
-import Data.Either
-import qualified Data.ByteString as B
-import Data.X509
import Data.X509.CertificateStore
import Control.Applicative ((<$>))
-import Control.Monad (filterM)
import qualified Control.Exception as E
-import Data.Char
import Data.Maybe (catMaybes)
import Data.Monoid (mconcat)
@@ -46,54 +36,11 @@
envPathOverride :: String
envPathOverride = "SYSTEM_CERTIFICATE_PATH"
--- List all the path susceptible to contains a certificate in a directory
---
--- if the parameter is not a directory, hilarity follows.
-listDirectoryCerts :: FilePath -> IO [FilePath]
-listDirectoryCerts path =
-getDirContents >>= filterM doesFileExist
- where
-isHashedFile s = length s == 10
- && isDigit (s !! 9)
- && (s !! 8) == '.'
- && all isHexDigit (take 8 s)
-isCert x = (not $ isPrefixOf "." x) && (not $ isHashedFile x)
-
-getDirContents = E.catch (map (path ) . filter isCert <$>
getDirectoryContents path) emptyPaths
-where emptyPaths :: E.IOException -> IO [FilePath]
- emptyPaths _ = return []
-
-makeCertStore :: FilePath -> IO (Maybe CertificateStore)
-makeCertStore path = do
-isDir <- doesDirectoryExist path
-isFile <- doesFileExist path
-wrapStore <$> (if isDir then makeDirStore else if isFile then
makeFileStore else return [])
- where
-wrapStore :: [SignedCertificate] -> Maybe CertificateStore
-wrapStore [] = Nothing
-wrapStore l = Just $ makeCertificateStore l
-
-makeFileStore = readCertificates path
-makeDirStore = do
-certFiles <- listDirectoryCerts path
-concat <$> mapM readCertificates certFiles
-
-
getSystemCertificateStore :: IO CertificateStore
-getSystemCertificateStore = mconcat . catMaybes <$> (getSystemPaths >>= mapM
makeCertStore)
+getSystemCertificateStore = mconcat . catMaybes <$> (getSystemPaths >>= mapM
readCertificateStore)
getSystemPaths :: IO [FilePath]
getSystemPaths = E.catch ((:[]) <$> getEnv
commit ghc-x509-system for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509-system for openSUSE:Factory
checked in at 2016-07-20 09:20:01
Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509-system.new (New)
Package is "ghc-x509-system"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes
2015-12-23 08:50:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-x509-system.new/ghc-x509-system.changes
2016-07-20 09:20:03.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 10 17:13:30 UTC 2016 - psim...@suse.com
+
+- Update to version 1.6.3 revision 0 with cabal2obs.
+
+---
Other differences:
--
++ ghc-x509-system.spec ++
--- /var/tmp/diff_new_pack.ysHpR1/_old 2016-07-20 09:20:03.0 +0200
+++ /var/tmp/diff_new_pack.ysHpR1/_new 2016-07-20 09:20:03.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-x509-system
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -17,20 +17,15 @@
%global pkg_name x509-system
-
-Name: ghc-x509-system
+Name: ghc-%{pkg_name}
Version:1.6.3
Release:0
Summary:Handle per-operating-system X.509 accessors and storage
License:BSD-3-Clause
Group: System/Libraries
-
Url:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
@@ -39,35 +34,38 @@
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-pem-devel
BuildRequires: ghc-process-devel
+BuildRequires: ghc-rpm-macros
BuildRequires: ghc-x509-devel
BuildRequires: ghc-x509-store-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
# End cabal-rpm deps
%description
System X.509 handling.
-
%package devel
Summary:Haskell %{pkg_name} library development files
Group: Development/Libraries/Other
+Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
-Requires: %{name} = %{version}-%{release}
%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
+
%post devel
%ghc_pkg_recache
commit ghc-x509-system for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-x509-system for openSUSE:Factory checked in at 2015-12-23 08:50:15 Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old) and /work/SRC/openSUSE:Factory/.ghc-x509-system.new (New) Package is "ghc-x509-system" Changes: --- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes 2015-09-17 09:19:49.0 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-x509-system.new/ghc-x509-system.changes 2015-12-23 08:50:16.0 +0100 @@ -1,0 +2,5 @@ +Mon Dec 21 08:11:02 UTC 2015 - mimi...@gmail.com + +- update to 1.6.3 + +--- Old: x509-system-1.6.1.tar.gz New: x509-system-1.6.3.tar.gz Other differences: -- ++ ghc-x509-system.spec ++ --- /var/tmp/diff_new_pack.2M18CJ/_old 2015-12-23 08:50:17.0 +0100 +++ /var/tmp/diff_new_pack.2M18CJ/_new 2015-12-23 08:50:17.0 +0100 @@ -19,7 +19,7 @@ %global pkg_name x509-system Name: ghc-x509-system -Version:1.6.1 +Version:1.6.3 Release:0 Summary:Handle per-operating-system X.509 accessors and storage License:BSD-3-Clause ++ x509-system-1.6.1.tar.gz -> x509-system-1.6.3.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-system-1.6.1/System/X509/Unix.hs new/x509-system-1.6.3/System/X509/Unix.hs --- old/x509-system-1.6.1/System/X509/Unix.hs 2015-09-07 14:46:45.0 +0200 +++ new/x509-system-1.6.3/System/X509/Unix.hs 2015-12-19 09:08:49.0 +0100 @@ -32,6 +32,8 @@ import qualified Control.Exception as E import Data.Char +import Data.Maybe (catMaybes) +import Data.Monoid (mconcat) defaultSystemPaths :: [FilePath] defaultSystemPaths = @@ -44,33 +46,41 @@ envPathOverride :: String envPathOverride = "SYSTEM_CERTIFICATE_PATH" -listDirectoryCerts :: FilePath -> IO (Maybe [FilePath]) -listDirectoryCerts path = do +-- List all the path susceptible to contains a certificate in a directory +-- +-- if the parameter is not a directory, hilarity follows. +listDirectoryCerts :: FilePath -> IO [FilePath] +listDirectoryCerts path = +getDirContents >>= filterM doesFileExist + where +isHashedFile s = length s == 10 + && isDigit (s !! 9) + && (s !! 8) == '.' + && all isHexDigit (take 8 s) +isCert x = (not $ isPrefixOf "." x) && (not $ isHashedFile x) + +getDirContents = E.catch (map (path ) . filter isCert <$> getDirectoryContents path) emptyPaths +where emptyPaths :: E.IOException -> IO [FilePath] + emptyPaths _ = return [] + +makeCertStore :: FilePath -> IO (Maybe CertificateStore) +makeCertStore path = do isDir <- doesDirectoryExist path isFile <- doesFileExist path -if isDir -then (fmap (map (path ) . filter isCert) <$> getDirContents) - >>= maybe (return Nothing) (\l -> Just <$> filterM doesFileExist l) -else if isFile then return $ Just [path] else return Nothing -where isHashedFile s = length s == 10 -&& isDigit (s !! 9) -&& (s !! 8) == '.' -&& all isHexDigit (take 8 s) - isCert x = (not $ isPrefixOf "." x) && (not $ isHashedFile x) - - getDirContents = E.catch (Just <$> getDirectoryContents path) emptyPaths -where emptyPaths :: E.IOException -> IO (Maybe [FilePath]) - emptyPaths _ = return Nothing +wrapStore <$> (if isDir then makeDirStore else if isFile then makeFileStore else return []) + where +wrapStore :: [SignedCertificate] -> Maybe CertificateStore +wrapStore [] = Nothing +wrapStore l = Just $ makeCertificateStore l + +makeFileStore = readCertificates path +makeDirStore = do +certFiles <- listDirectoryCerts path +concat <$> mapM readCertificates certFiles + getSystemCertificateStore :: IO CertificateStore -getSystemCertificateStore = makeCertificateStore <$> (getSystemPaths >>= findFirst) - where findFirst [] = return [] -findFirst (p:ps) = do -r <- listDirectoryCerts p -case r of -Nothing-> findFirst ps -Just []-> findFirst ps -Just files -> concat <$> mapM readCertificates files +getSystemCertificateStore = mconcat . catMaybes <$> (getSystemPaths >>= mapM makeCertStore) getSystemPaths :: IO [FilePath] getSystemPaths = E.catch ((:[]) <$> getEnv envPathOverride) inDefault @@ -78,6 +88,9 @@ inDefault :: E.IOException -> IO [FilePath] inDefault _ = return defaultSystemPaths +-- Try
commit ghc-x509-system for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509-system for openSUSE:Factory
checked in at 2015-09-17 09:19:48
Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509-system.new (New)
Package is "ghc-x509-system"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes
2015-08-25 08:48:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509-system.new/ghc-x509-system.changes
2015-09-17 09:19:49.0 +0200
@@ -1,0 +2,5 @@
+Sun Sep 13 13:14:35 UTC 2015 - mimi...@gmail.com
+
+- update to 1.6.1
+
+---
Old:
x509-system-1.6.0.tar.gz
New:
x509-system-1.6.1.tar.gz
Other differences:
--
++ ghc-x509-system.spec ++
--- /var/tmp/diff_new_pack.PXYlkW/_old 2015-09-17 09:19:50.0 +0200
+++ /var/tmp/diff_new_pack.PXYlkW/_new 2015-09-17 09:19:50.0 +0200
@@ -15,15 +15,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%global pkg_name x509-system
Name: ghc-x509-system
-Version:1.6.0
+Version:1.6.1
Release:0
Summary:Handle per-operating-system X.509 accessors and storage
+License:BSD-3-Clause
Group: System/Libraries
-License:BSD-3-Clause
Url:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -61,30 +62,23 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%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,-)
-
%changelog
++ x509-system-1.6.0.tar.gz -> x509-system-1.6.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-system-1.6.0/System/X509/MacOS.hs
new/x509-system-1.6.1/System/X509/MacOS.hs
--- old/x509-system-1.6.0/System/X509/MacOS.hs 2015-06-19 22:17:39.0
+0200
+++ new/x509-system-1.6.1/System/X509/MacOS.hs 2015-09-07 14:46:45.0
+0200
@@ -11,16 +11,19 @@
import Data.X509
import Data.X509.CertificateStore
-rootCAKeyChain :: String
+rootCAKeyChain :: FilePath
rootCAKeyChain = "/System/Library/Keychains/SystemRootCertificates.keychain"
-listInKeyChain :: String -> IO [SignedCertificate]
-listInKeyChain keyChain = do
-(_, Just hout, _, ph) <- createProcess (proc "security"
["find-certificate", "-pa", keyChain]) { std_out = CreatePipe }
+systemKeyChain :: FilePath
+systemKeyChain = "/Library/Keychains/System.keychain"
+
+listInKeyChains :: [FilePath] -> IO [SignedCertificate]
+listInKeyChains keyChains = do
+(_, Just hout, _, ph) <- createProcess (proc "security"
("find-certificate" : "-pa" : keyChains)) { std_out = CreatePipe }
pems <- either error id . pemParseLBS <$> LBS.hGetContents hout
let targets = rights $ map (decodeSignedCertificate . pemContent) $ filter
((=="CERTIFICATE") . pemName) pems
_ <- targets `seq` waitForProcess ph
return targets
getSystemCertificateStore :: IO CertificateStore
-getSystemCertificateStore = makeCertificateStore <$> listInKeyChain
rootCAKeyChain
+getSystemCertificateStore = makeCertificateStore <$> listInKeyChains
[rootCAKeyChain, systemKeyChain]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-system-1.6.0/System/X509/Win32.hs
new/x509-system-1.6.1/System/X509/Win32.hs
--- old/x509-system-1.6.0/System/X509/Win32.hs 2015-06-19 22:17:39.0
+0200
+++ new/x509-system-1.6.1/System/X509/Win32.hs 2015-09-07 14:46:45.0
+0200
@@ -11,11 +11,13 @@
import Control.Monad (when)
import Control.Applicative
+import Control.Exception (catch)
import qualified Data.ByteString.Internal as B
import Data.X509
import Data.X509.CertificateStore
+import Data.ASN1.Error
import System.Win32.Types
@@ -64,4 +66,4 @@
case ecert of
Left _ -> loop st r
Right cert -> (cert :) <$> (loop st r)
-
+`catch` \(_ :: ASN1Error) -> loop st r
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-system-1.6.0/x509-system.cabal
new/x509-system-1.6.1/x509-system.cabal
--- old/x509-system-1.6.0/x509-system.cabal 2015-06-19 22:17:39.0
+0200
+++ new/x509-system-1.6.1/x509-system.cabal 2015-09-07 14:46:45.0
+0200
@@ -1,5
commit ghc-x509-system for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509-system for openSUSE:Factory
checked in at 2015-08-25 07:19:26
Comparing /work/SRC/openSUSE:Factory/ghc-x509-system (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509-system.new (New)
Package is ghc-x509-system
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509-system/ghc-x509-system.changes
2015-05-28 09:53:45.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509-system.new/ghc-x509-system.changes
2015-08-25 08:48:30.0 +0200
@@ -1,0 +2,5 @@
+Thu Aug 6 20:40:15 UTC 2015 - mimi...@gmail.com
+
+- update to 1.6.0
+
+---
Old:
x509-system-1.5.0.tar.gz
New:
x509-system-1.6.0.tar.gz
Other differences:
--
++ ghc-x509-system.spec ++
--- /var/tmp/diff_new_pack.y63N3R/_old 2015-08-25 08:48:31.0 +0200
+++ /var/tmp/diff_new_pack.y63N3R/_new 2015-08-25 08:48:31.0 +0200
@@ -17,8 +17,8 @@
%global pkg_name x509-system
-Name: ghc-%{pkg_name}
-Version:1.5.0
+Name: ghc-x509-system
+Version:1.6.0
Release:0
Summary:Handle per-operating-system X.509 accessors and storage
Group: System/Libraries
++ x509-system-1.5.0.tar.gz - x509-system-1.6.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-system-1.5.0/x509-system.cabal
new/x509-system-1.6.0/x509-system.cabal
--- old/x509-system-1.5.0/x509-system.cabal 2014-10-19 11:38:03.0
+0200
+++ new/x509-system-1.6.0/x509-system.cabal 2015-06-19 22:17:39.0
+0200
@@ -1,5 +1,5 @@
Name:x509-system
-Version: 1.5.0
+Version: 1.6.0
Description: System X.509 handling
License: BSD3
License-file:LICENSE
@@ -22,8 +22,8 @@
, filepath
, process
, pem = 0.1 0.3
- , x509 = 1.5 1.6
- , x509-store = 1.5 1.6
+ , x509 = 1.6 1.7
+ , x509-store = 1.6 1.7
Exposed-modules: System.X509
System.X509.Unix
System.X509.MacOS
