Skip to content

Commit 63068f6

Browse files
committed
Applied updates
1 parent 707ceb3 commit 63068f6

File tree

8 files changed

+52
-16
lines changed

8 files changed

+52
-16
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- uses: actions/checkout@v4
4343
- name: Install build dependencies
4444
run: |
45-
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex git libssl-dev libtool pkg-config zlib1g-dev
45+
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev
4646
- name: Download test data
4747
run: |
4848
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -66,7 +66,7 @@ jobs:
6666
- uses: actions/checkout@v4
6767
- name: Install build dependencies
6868
run: |
69-
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex git libssl-dev libtool pkg-config zlib1g-dev
69+
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev
7070
- name: Download test data
7171
run: |
7272
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -90,7 +90,7 @@ jobs:
9090
- uses: actions/checkout@v4
9191
- name: Install build dependencies
9292
run: |
93-
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex git libssl-dev libtool pkg-config zlib1g-dev libfuse-dev
93+
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev libfuse-dev
9494
- name: Download test data
9595
run: |
9696
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -114,7 +114,7 @@ jobs:
114114
- uses: actions/checkout@v4
115115
- name: Install build dependencies
116116
run: |
117-
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex git libssl-dev libtool pkg-config zlib1g-dev libfuse3-dev
117+
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev libfuse3-dev
118118
- name: Download test data
119119
run: |
120120
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -141,7 +141,7 @@ jobs:
141141
run: |
142142
sudo add-apt-repository universe &&
143143
sudo apt-get update &&
144-
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
144+
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
145145
- name: Download test data
146146
run: |
147147
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -167,14 +167,14 @@ jobs:
167167
steps:
168168
- uses: actions/checkout@v4
169169
- name: Set up Python ${{ matrix.python-version }}
170-
uses: actions/setup-python@v1
170+
uses: actions/setup-python@v5
171171
with:
172172
python-version: ${{ matrix.python-version }}
173173
- name: Install build dependencies
174174
run: |
175175
sudo add-apt-repository universe &&
176176
sudo apt-get update &&
177-
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
177+
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
178178
- name: Building from source
179179
env:
180180
CC: ${{ matrix.compiler }}
@@ -198,7 +198,7 @@ jobs:
198198
- uses: actions/checkout@v4
199199
- name: Install build dependencies
200200
run: |
201-
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex git libssl-dev libtool pkg-config zlib1g-dev
201+
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev
202202
- name: Download test data
203203
run: |
204204
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi

.github/workflows/build_freebsd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
mem: 4096
1616
# Note that the test scripts require bash
1717
prepare: |
18-
pkg install -y autoconf automake bash byacc flex fusefs-libs gettext git libtool openssl pkgconf
18+
pkg install -y autoconf automake bash fusefs-libs gettext git libtool openssl pkgconf
1919
run: |
2020
tests/build.sh
2121
tests/runtests.sh

.github/workflows/build_ossfuzz.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Build OSSFuzz fuzz targets from source.
2+
name: build_ossfuzz
3+
on:
4+
push:
5+
branches: [main]
6+
permissions: read-all
7+
jobs:
8+
build_ossfuzz:
9+
runs-on: ubuntu-22.04
10+
strategy:
11+
matrix:
12+
include:
13+
- architecture: 'x64'
14+
compiler: 'gcc'
15+
configure_options: ''
16+
steps:
17+
- name: Install build dependencies
18+
run: |
19+
sudo apt-get -y install git
20+
- uses: actions/checkout@v4
21+
with:
22+
repository: google/oss-fuzz
23+
path: oss-fuzz
24+
- name: Build OSSFuzz fuzz targets
25+
working-directory: oss-fuzz
26+
run: |
27+
mkdir -p projects/libewf
28+
cp projects/libyal/build.sh projects/libewf/
29+
cp projects/libyal/project.yaml projects/libewf/
30+
head -n 20 projects/libyal/Dockerfile > projects/libewf/Dockerfile
31+
echo "RUN git clone --depth 1 https://github.com/libyal/libewf.git libewf" >> projects/libewf/Dockerfile
32+
tail -n 3 projects/libyal/Dockerfile >> projects/libewf/Dockerfile
33+
python3 infra/helper.py build_image --pull libewf
34+
python3 infra/helper.py build_fuzzers --sanitizer address libewf
35+
python3 infra/helper.py check_build libewf

.github/workflows/build_shared.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,14 @@ jobs:
1010
strategy:
1111
matrix:
1212
include:
13-
- architecture: 'x64'
14-
compiler: 'gcc'
15-
configure_options: ''
1613
- architecture: 'x64'
1714
compiler: 'gcc'
1815
configure_options: '--enable-wide-character-type'
1916
steps:
2017
- uses: actions/checkout@v4
2118
- name: Install build dependencies
2219
run: |
23-
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex git libssl-dev libtool pkg-config zlib1g-dev
20+
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev
2421
- name: Download test data
2522
run: |
2623
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi

appveyor.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,9 @@ install:
269269
Else {
270270
.\syncdokan.ps1 }
271271
}
272+
- ps: If (($env:BUILD_ENVIRONMENT -eq "msbuild") -And (Test-Path ".\synctestdata.ps1")) {
273+
.\synctestdata.ps1 }
274+
- sh: if ( test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode" ) && test -f "./synctestdata.sh"; then ./synctestdata.sh; fi
272275
- cmd: if [%TARGET%]==[vs2010] (
273276
pushd ..\dokan &&
274277
set PYTHONPATH=..\vstools &&

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
22

33
AC_INIT(
44
[libewf],
5-
[20240520],
5+
[20240827],
66
[joachim.metz@gmail.com])
77

88
AC_CONFIG_SRCDIR(

libewf.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ status: "experimental"
44
year_of_creation: "2006"
55
data_format: "Expert Witness Compression Format (EWF)"
66
documenation_url: "https://github.com/libyal/libewf/tree/main/documentation"
7-
features: ["debug_output"]
7+
features: ["debug_output", "ossfuzz", "python_bindings", "tools"]
88

99
[library]
1010
build_dependencies: ["bzip2", "crypto", "zlib"]
11+
features: ["pthread", "source_glob", "wide_character_type"]
1112
public_types: ["access_control_entry", "attribute", "data_chunk", "file_entry", "handle", "source", "subject"]
1213

1314
[python_module]

tests/ewf_test_support.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1914,7 +1914,7 @@ int ewf_test_glob_wide_get_segment_filename(
19141914
libcerror_error_free(
19151915
&error );
19161916

1917-
segment_filename = (char *) 0x12345678UL;
1917+
segment_filename = (wchar_t *) 0x12345678UL;
19181918

19191919
result = libewf_glob_wide_get_segment_filename(
19201920
L"test.E01",

0 commit comments

Comments
 (0)