Merge branch 'master' of github.com:haskell-cryptography/HsOpenSSL

Author: vshabanov

.github/workflows/haskell.yml

@@ -11,22 +11,59 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Add more elements to this list to run multiple instances of the build in CI.  Increasing the
-        # number instances is a good way to trigger flaky build failures
-        n: [1]
-
-        ghc: ["8.10.7"]
-        os: [ubuntu-latest, macos-latest, windows-latest]
-
+        ghc:
+        - "8.0.2"
+        - "8.2.2"
+        - "8.4.4"
+        - "8.6.5"
+        - "8.8.4"
+        - "8.10.7"
+        - "9.0.2"
+        - "9.2.8"
+        - "9.4.8"
+        - "9.6.6"
+        - "9.8.4"
+        - "9.10.1"
+        - "9.12.1"
+        # FIXME: Add windows-latest back to CI once it is passing.
+        os: [ubuntu-latest]
+
+        # Action fails to install GHC < 8.10 on OSX with a generic error
+        # messsage:
+        #
+        #   Error: All install methods for ghc 8.0.2 failed
+        #
+        # On the other hand, 8.10 and 9.0 fail due to LLVM:
+        #
+        #   Warning: Couldn't figure out LLVM version!
+        #            Make sure you have installed LLVM between [9 and 13)
+        include:
+          - {ghc: "8.0.2" , os: "macos-13"}
+          - {ghc: "8.2.2" , os: "macos-13"}
+          - {ghc: "8.4.4" , os: "macos-13"}
+          - {ghc: "8.6.5" , os: "macos-13"}
+          - {ghc: "8.8.4" , os: "macos-13"}
+          - {ghc: "8.10.7", os: "macos-13"}
+          - {ghc: "9.0.2" , os: "macos-13"}
+          - {ghc: "9.2.8" , os: "macos-latest"}
+          - {ghc: "9.4.8" , os: "macos-latest"}
+          - {ghc: "9.6.6" , os: "macos-latest"}
+          - {ghc: "9.8.4" , os: "macos-latest"}
+          - {ghc: "9.10.1", os: "macos-latest"}
+          - {ghc: "9.12.1", os: "macos-latest"}
     env:
       # OpenSSL is installed in a non-standard location in MacOS. See
       # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-latest-Readme.md
       PKG_CONFIG_PATH: ${{ (matrix.os == 'macos-latest' && '/usr/lib/pkgconfig:/usr/local/opt/[email protected]/lib/pkgconfig') || (matrix.os == 'ubuntu-latest' && '/usr/lib/pkgconfig:/usr/local/lib/pkgconfig') || '' }}
-      
+
       # FIXME: this is arguably a bug, and pkg-config should return the right values!
       LD_LIBRARY_PATH: ${{ (matrix.os != 'windows-latest' && '/usr/local/lib') || '' }}
 
     steps:
+    - uses: haskell-actions/setup@v2
+      with:
+        ghc-version: ${{ matrix.ghc }}
+
     - name: "WIN: Install System Dependencies via pacman (msys2)"
       if: runner.os == 'Windows'
       run: |
@@ -41,11 +78,12 @@ jobs:
             automake `
             libtool `
             make
-  
+
     # this seems to break something. It _must_ come after the pacman setup
     # above. It appears as if PATHEXT is set _after_ ghcup install ghc/cabal, and
     # as such we'd need pacman.exe instead.
-    - name: Setup Haskell
+    - name: "WIN: Setup Haskell"
+      if: runner.os == 'Windows'
       run: |
         # Use GHCUP to manage ghc/cabal
         ghcup install ghc --set ${{ matrix.ghc }}
@@ -92,7 +130,7 @@ jobs:
       shell: bash
       run: echo '${{ steps.cabal-store.outputs.cabal-store }}'
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: "[PowerShell] Add build script path"
       if: runner.os == 'Windows'
@@ -138,7 +176,7 @@ jobs:
         cat dist-newstyle/cache/plan.json | jq -r '."install-plan"[].id' | sort | uniq > dependencies.txt
 
     - name: Cache Cabal store
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ${{ steps.cabal-store.outputs.cabal-store }}
         key: cache-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('dependencies.txt') }}

HsOpenSSL.cabal

@@ -10,7 +10,7 @@ Description:
     systems and stable. You may also be interested in the @tls@ package,
     <http://hackage.haskell.org/package/tls>, which is a pure Haskell
     implementation of SSL.
-Version:       0.11.7.8
+Version:       0.11.7.9
 License:       PublicDomain
 License-File:  COPYING
 Author:        Adam Langley, Mikhail Vorozhtsov, PHO, Taru Karttunen
@@ -21,12 +21,24 @@ Bug-Reports:   https://github.com/haskell-cryptography/HsOpenSSL/issues
 Category:      Cryptography
 Cabal-Version: 1.12
 Tested-With:
-    GHC==8.8.1, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3
-Build-Type:    Custom
-Extra-Source-Files:
+    GHC ==8.0.2
+     || ==8.2.2
+     || ==8.4.4
+     || ==8.6.5
+     || ==8.8.4
+     || ==8.10.7
+     || ==9.0.2
+     || ==9.2.8
+     || ==9.4.8
+     || ==9.6.6
+     || ==9.8.1
+     || ==9.10.1
+Build-Type:    Simple
+Extra-Doc-Files:
     AUTHORS
     ChangeLog
     README.md
+Extra-Source-Files:
     cbits/HsOpenSSL.h
     cbits/mutex.h
     examples/Makefile
@@ -39,7 +51,7 @@ Extra-Source-Files:
 
 Source-Repository head
     Type: git
-    Location: git://github.com/haskell-cryptography/HsOpenSSL.git
+    Location: https://github.com/haskell-cryptography/HsOpenSSL.git
 
 Flag fast-bignum
     Description:
@@ -67,10 +79,6 @@ Flag use-pkg-config
     Manual:
         True
 
-Custom-setup
-    setup-depends: Cabal >= 1.12 && < 4,
-                   base  >= 4.8 && < 5
-
 Library
     Build-Depends:
         base       >= 4.8 && < 5,
@@ -88,11 +96,15 @@ Library
         Build-Depends: integer-gmp >= 1.0.0 && < 1.1.0
 
     if os(darwin) && flag(homebrew-openssl)
-        Include-Dirs: /usr/local/opt/openssl/include
-        Extra-Lib-Dirs: /usr/local/opt/openssl/lib
+        if arch(aarch64)
+            Include-Dirs:   /opt/homebrew/opt/openssl/include
+            Extra-Lib-Dirs: /opt/homebrew/opt/openssl/lib
+        else
+            Include-Dirs:   /usr/local/opt/openssl/include
+            Extra-Lib-Dirs: /usr/local/opt/openssl/lib
 
     if os(darwin) && flag(macports-openssl)
-        Include-Dirs: /opt/local/include
+        Include-Dirs:   /opt/local/include
         Extra-Lib-Dirs: /opt/local/lib
 
     if flag(use-pkg-config)