Merge pull request #40 from vmchale/libarchive-clib-3.8.4

Bump C sources to 3.8.4

Author: hasufell

.github/workflows/haskell.yml

@@ -2,29 +2,27 @@ name: Haskell CI
 
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 jobs:
   hlint:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
 
     - name: Run hlint
       run: curl -sSL https://raw.github.com/ndmitchell/hlint/master/misc/run.sh | sh -s -- -r libarchive/src libarchive/mem libarchive/bench libarchive/test
       shell: bash
 
-  build-cabal:
+  build:
 
     runs-on: ${{ matrix.os }}-latest
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu, macOS, windows]
-        builder: ['cabal 3.6.2.0 ghc 8.10.7', 'cabal 3.10.2.0 ghc 9.2.8', 'stack 2.13.1']
+        builder: ['cabal 3.12.1.0 ghc 9.6.7', 'cabal 3.16.0.0 ghc 9.10.3', 'stack 3.7.1']
 
         include:
           - os: windows
@@ -39,7 +37,14 @@ jobs:
         shell: ${{ matrix.shell }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
+
+    - uses: haskell/ghcup-setup@v1
+
+    - if: runner.os == 'Linux'
+      run: |
+        sudo apt-get update -y
+        sudo apt-get install -y libbz2-dev
 
     - if: runner.os == 'Windows'
       uses: msys2/setup-msys2@v2
@@ -67,7 +72,7 @@ jobs:
     - if: runner.os == 'macOS'
       name: Install automake via brew
       run: |
-          bash .github/scripts/brew.sh automake
+          bash .github/scripts/brew.sh automake libtool
           echo "$HOME/.brew/bin" >> $GITHUB_PATH
           echo "$HOME/.brew/sbin" >> $GITHUB_PATH
 
@@ -103,7 +108,7 @@ jobs:
         ghcup install ${{ steps.get.outputs.builder }} ${{ steps.get.outputs.builder_version }}
 
     - name: Cache
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       env:
         cache-name: ${{ steps.get.outputs.builder }}
       with:
@@ -163,7 +168,7 @@ jobs:
       run: cabal-docspec -XCPP -XTypeSynonymInstances -XOverloadedStrings libarchive
 
     - name: Download benchmark files
-      run: make -C libarchive -j1 setup 
+      run: make -C libarchive -j1 setup
 
     - name: Run benches
       run: ${{ steps.get.outputs.builder }} bench libarchive
@@ -172,9 +177,9 @@ jobs:
       run: ${{ steps.get.outputs.builder }} haddock libarchive
       continue-on-error: true
 
-    - if: always()
-      uses: actions/upload-artifact@v2
+    - if: steps.get.outputs.builder == 'cabal'
+      uses: actions/upload-artifact@v5
       with:
-        name: plan.json
+        name: ${{ matrix.os }}-${{ steps.get.outputs.builder_version }}-${{ steps.get.outputs.ghc_version }}-plan.json
         path: ./dist-newstyle/cache/plan.json
 

cabal.project

@@ -1,6 +1,5 @@
 packages: ./libarchive/libarchive.cabal
           ./libarchive-clib/libarchive-clib.cabal
-          ./zlib-clib/zlib-clib.cabal
 max-backjumps: 40000
 
 constraints: zlib -pkg-config +bundled-c-zlib

libarchive-clib/build/autoconf/config.guess

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2024 Free Software Foundation, Inc.
+#   Copyright 1992-2025 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2024-01-01'
+timestamp='2025-07-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2024 Free Software Foundation, Inc.
+Copyright 1992-2025 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,7 +123,7 @@ set_cc_for_build() {
     dummy=$tmp/dummy
     case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
 	,,)    echo "int x;" > "$dummy.c"
-	       for driver in cc gcc c89 c99 ; do
+	       for driver in cc gcc c17 c99 c89 ; do
 		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
 		       CC_FOR_BUILD=$driver
 		       break
@@ -634,7 +634,8 @@ EOF
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
-		main()
+		int
+		main ()
 			{
 			if (!__power_pc())
 				exit(1);
@@ -718,7 +719,8 @@ EOF
 		#include <stdlib.h>
 		#include <unistd.h>
 
-		int main ()
+		int
+		main ()
 		{
 		#if defined(_SC_KERNEL_BITS)
 		    long bits = sysconf(_SC_KERNEL_BITS);
@@ -1595,8 +1597,11 @@ EOF
     *:Unleashed:*:*)
 	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
 	;;
-    *:Ironclad:*:*)
-	GUESS=$UNAME_MACHINE-unknown-ironclad
+    x86_64:[Ii]ronclad:*:*|i?86:[Ii]ronclad:*:*)
+	GUESS=$UNAME_MACHINE-pc-ironclad-mlibc
+	;;
+    *:[Ii]ronclad:*:*)
+	GUESS=$UNAME_MACHINE-unknown-ironclad-mlibc
 	;;
 esac
 
@@ -1621,6 +1626,7 @@ cat > "$dummy.c" <<EOF
 #endif
 #endif
 #endif
+int
 main ()
 {
 #if defined (sony)
@@ -1805,8 +1811,8 @@ fi
 exit 1
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-format: "%Y-%02m-%02d"
 # time-stamp-end: "'"
 # End: