Skip to content

Commit

Permalink
Applied updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Aug 28, 2024
1 parent 707ceb3 commit 63068f6
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 16 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex 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
Expand All @@ -66,7 +66,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex 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
Expand All @@ -90,7 +90,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex 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
Expand All @@ -114,7 +114,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex 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
Expand All @@ -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 byacc flex 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
Expand All @@ -167,14 +167,14 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install build dependencies
run: |
sudo add-apt-repository universe &&
sudo apt-get update &&
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex 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 }}
Expand All @@ -198,7 +198,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex 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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_freebsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
mem: 4096
# Note that the test scripts require bash
prepare: |
pkg install -y autoconf automake bash byacc flex fusefs-libs gettext git libtool openssl pkgconf
pkg install -y autoconf automake bash fusefs-libs gettext git libtool openssl pkgconf
run: |
tests/build.sh
tests/runtests.sh
35 changes: 35 additions & 0 deletions .github/workflows/build_ossfuzz.yml
Original file line number Diff line number Diff line change
@@ -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/libewf
cp projects/libyal/build.sh projects/libewf/
cp projects/libyal/project.yaml projects/libewf/
head -n 20 projects/libyal/Dockerfile > projects/libewf/Dockerfile
echo "RUN git clone --depth 1 https://github.com/libyal/libewf.git libewf" >> projects/libewf/Dockerfile
tail -n 3 projects/libyal/Dockerfile >> projects/libewf/Dockerfile
python3 infra/helper.py build_image --pull libewf
python3 infra/helper.py build_fuzzers --sanitizer address libewf
python3 infra/helper.py check_build libewf
5 changes: 1 addition & 4 deletions .github/workflows/build_shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 byacc flex 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
Expand Down
3 changes: 3 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,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 &&
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ([2.71])

AC_INIT(
[libewf],
[20240520],
[20240827],
[[email protected]])

AC_CONFIG_SRCDIR(
Expand Down
3 changes: 2 additions & 1 deletion libewf.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ status: "experimental"
year_of_creation: "2006"
data_format: "Expert Witness Compression Format (EWF)"
documenation_url: "https://github.com/libyal/libewf/tree/main/documentation"
features: ["debug_output"]
features: ["debug_output", "ossfuzz", "python_bindings", "tools"]

[library]
build_dependencies: ["bzip2", "crypto", "zlib"]
features: ["pthread", "source_glob", "wide_character_type"]
public_types: ["access_control_entry", "attribute", "data_chunk", "file_entry", "handle", "source", "subject"]

[python_module]
Expand Down
2 changes: 1 addition & 1 deletion tests/ewf_test_support.c
Original file line number Diff line number Diff line change
Expand Up @@ -1914,7 +1914,7 @@ int ewf_test_glob_wide_get_segment_filename(
libcerror_error_free(
&error );

segment_filename = (char *) 0x12345678UL;
segment_filename = (wchar_t *) 0x12345678UL;

result = libewf_glob_wide_get_segment_filename(
L"test.E01",
Expand Down

0 comments on commit 63068f6

Please sign in to comment.