Applied updates

libyal · Aug 22, 2024 · ca158c7 · ca158c7
1 parent 50c3038
commit ca158c7
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install build dependencies
       run: |
-        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config zlib1g-dev
+        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -66,7 +66,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install build dependencies
       run: |
-        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config zlib1g-dev
+        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -90,7 +90,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install build dependencies
       run: |
-        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config zlib1g-dev libfuse-dev
+        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev libfuse-dev
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -114,7 +114,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install build dependencies
       run: |
-        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config zlib1g-dev libfuse3-dev
+        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev libfuse3-dev
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -141,7 +141,7 @@ jobs:
       run: |
         sudo add-apt-repository universe &&
         sudo apt-get update &&
-        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config zlib1g-dev python3-dev python-dev-is-python3
+        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev python3-dev python-dev-is-python3
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -174,7 +174,7 @@ jobs:
       run: |
         sudo add-apt-repository universe &&
         sudo apt-get update &&
-        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config zlib1g-dev python3-dev python-dev-is-python3
+        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev python3-dev python-dev-is-python3
     - name: Building from source
       env:
         CC: ${{ matrix.compiler }}
@@ -198,7 +198,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install build dependencies
       run: |
-        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config zlib1g-dev
+        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi

diff --git a/.github/workflows/build_ossfuzz.yml b/.github/workflows/build_ossfuzz.yml
@@ -0,0 +1,35 @@
+# Build OSSFuzz fuzz targets from source.
+name: build_ossfuzz
+on:
+  push:
+    branches: [main]
+permissions: read-all
+jobs:
+  build_ossfuzz:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        include:
+        - architecture: 'x64'
+          compiler: 'gcc'
+          configure_options: ''
+    steps:
+    - name: Install build dependencies
+      run: |
+        sudo apt-get -y install git
+    - uses: actions/checkout@v4
+      with:
+        repository: google/oss-fuzz
+        path: oss-fuzz
+    - name: Build OSSFuzz fuzz targets
+      working-directory: oss-fuzz
+      run: |
+        mkdir -p projects/libqcow
+        cp projects/libyal/build.sh projects/libqcow/
+        cp projects/libyal/project.yaml projects/libqcow/
+        head -n 20 projects/libyal/Dockerfile > projects/libqcow/Dockerfile
+        echo "RUN git clone --depth 1 https://github.com/libyal/libqcow.git libqcow" >> projects/libqcow/Dockerfile
+        tail -n 3 projects/libyal/Dockerfile >> projects/libqcow/Dockerfile
+        python3 infra/helper.py build_image --pull libqcow
+        python3 infra/helper.py build_fuzzers --sanitizer address libqcow
+        python3 infra/helper.py check_build libqcow
diff --git a/.github/workflows/build_shared.yml b/.github/workflows/build_shared.yml
@@ -10,17 +10,14 @@ jobs:
     strategy:
       matrix:
         include:
-        - architecture: 'x64'
-          compiler: 'gcc'
-          configure_options: ''
         - architecture: 'x64'
           compiler: 'gcc'
           configure_options: '--enable-wide-character-type'
     steps:
     - uses: actions/checkout@v4
     - name: Install build dependencies
       run: |
-        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config zlib1g-dev
+        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi

diff --git a/appveyor.yml b/appveyor.yml
@@ -273,6 +273,9 @@ install:
     Else {
       .\syncdokan.ps1 }
     }
+- ps: If (($env:BUILD_ENVIRONMENT -eq "msbuild") -And (Test-Path ".\synctestdata.ps1")) {
+    .\synctestdata.ps1 }
+- sh: if ( test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode" ) && test -f "./synctestdata.sh"; then ./synctestdata.sh; fi
 - cmd: if [%TARGET%]==[vs2010] (
     pushd ..\dokan &&
     set PYTHONPATH=..\vstools &&

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 AC_INIT(
  [libqcow],
- [20240527],
+ [20240822],
  [[email protected]])
 
 AC_CONFIG_SRCDIR(

diff --git a/libqcow.ini b/libqcow.ini
@@ -4,10 +4,11 @@ status: "alpha"
 year_of_creation: "2010"
 data_format: "QEMU Copy-On-Write (QCOW) image file"
 documentation_url: "https://github.com/libyal/libqcow/tree/main/documentation"
-features: ["debug_output", "nuget"]
+features: ["debug_output", "nuget", "ossfuzz", "python_bindings", "tools"]
 
 [library]
 build_dependencies: ["crypto", "zlib"]
+features: ["pthread", "wide_character_type"]
 public_types: ["file"]
 
 [tools]

diff --git a/libqcow.nuspec b/libqcow.nuspec
@@ -2,15 +2,15 @@
 <package >
   <metadata>
     <id>libqcow</id>
-    <version>20240527</version>
+    <version>20240822</version>
     <authors>Joachim Metz</authors>
     <owners>joachimmetz</owners>
     <license type="expression">LGPL-3.0-or-later</license>
     <projectUrl>https://github.com/libyal/libqcow</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <title>libqcow</title>
     <description>Library to access the QEMU Copy-On-Write (QCOW) image file format</description>
-    <releaseNotes>Release of libqcow 20240527</releaseNotes>
+    <releaseNotes>Release of libqcow 20240822</releaseNotes>
     <copyright>Copyright (C) 2010-2024</copyright>
     <tags>native</tags>
   </metadata>