Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest libyal libpff #7

Merged
merged 54 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
07c0f56
Applied updates
joachimmetz Jun 8, 2021
184856b
Applied updates and code clean up
joachimmetz Aug 1, 2021
b5dc1b8
Applied updates and code clean up
joachimmetz Sep 18, 2021
3b3ab2c
Worked on tests and code clean up
joachimmetz Sep 18, 2021
d73a938
Code clean up
joachimmetz Sep 20, 2021
e86bce7
Worked on tests and code clean up
joachimmetz Sep 21, 2021
a2c23ef
Code clean up
joachimmetz Sep 25, 2021
1c6870e
Code clean up
joachimmetz Sep 25, 2021
4bb11ab
Code clean up
joachimmetz Sep 25, 2021
faa6c10
Worked on tests and code clean up
joachimmetz Sep 26, 2021
fad247a
Worked on tests and code clean up
joachimmetz Oct 5, 2021
f1248a6
Worked on tests
joachimmetz Oct 8, 2021
a3c9a7f
Worked on tests
joachimmetz Oct 9, 2021
54da107
Worked on tests
joachimmetz Oct 20, 2021
3c991f5
Worked on tests
joachimmetz Oct 21, 2021
e0593f4
Worked on tests
joachimmetz Oct 28, 2021
a2de09c
Worked on tests
joachimmetz Oct 29, 2021
89f373b
Worked on tests
joachimmetz Nov 3, 2021
21dd289
Worked on tests
joachimmetz Nov 4, 2021
732bc84
Worked on tests
joachimmetz Nov 5, 2021
9d6a3f0
Applied updated and improved compressed OST format support
joachimmetz Nov 14, 2021
b5fe576
Worked on tests
joachimmetz Nov 15, 2021
2e7512f
Worked on setup.py and Python CI tests
joachimmetz Dec 25, 2021
22c2a51
Code clean up
joachimmetz Dec 29, 2021
7cb3ec9
Applied updates and code clean up
joachimmetz Jan 6, 2022
56114a3
Applied updates and changes for #107
joachimmetz Feb 12, 2022
ceec883
Changes for deployment
joachimmetz Feb 13, 2022
e026fde
Changes to dpkg and rpm packaging files
joachimmetz Apr 18, 2022
6630a2c
Applied updates
joachimmetz May 1, 2022
63a95ee
Applied updates
joachimmetz Jul 13, 2022
4031ccd
Applied updates and changes for CI tests
joachimmetz Dec 8, 2022
28274e7
Applied updates and changes for CI tests
joachimmetz Dec 30, 2022
650f300
Applied updates
joachimmetz Jan 26, 2023
29144cc
Added record set OSS-Fuzz target and code clean up
joachimmetz Feb 12, 2023
33258b9
Worked on refactor and code clean up
joachimmetz Mar 5, 2023
ef04240
Worked on refactor and code clean up
joachimmetz Mar 5, 2023
0ba671e
Worked on refactor and code clean up
joachimmetz Mar 12, 2023
474370b
Worked on refactor and code clean up
joachimmetz Mar 18, 2023
f3f9f9c
Worked on refactor and code clean up
joachimmetz Mar 19, 2023
9003395
Worked on refactor and code clean up
joachimmetz Mar 25, 2023
6b72f69
Applied updates
joachimmetz Apr 5, 2023
99a86ef
Changes for CI tests
joachimmetz Apr 24, 2023
de2aa23
Applied updates and changes for tests
joachimmetz May 25, 2023
6ca131f
Applied updates
joachimmetz Sep 6, 2023
c983c1e
Applied updates and changes for deployment
joachimmetz Oct 21, 2023
da6c980
Applied updates
joachimmetz Nov 18, 2023
d8ab359
Applied updates and changes for deployment
joachimmetz Dec 5, 2023
740ba3a
Applied updates
joachimmetz Feb 13, 2024
87497ba
Changes for deployment
joachimmetz Apr 27, 2024
a8a59fd
Changes for deployment
joachimmetz Apr 27, 2024
2b160d2
Applied updates
joachimmetz Jun 8, 2024
bb5fb45
Merge remote-tracking branch 'libyal-libpff/main' into merge-latest-l…
jlepere-everlaw Aug 1, 2024
258d82f
Resolve conflicts.
jlepere-everlaw Aug 1, 2024
88a1aad
Update latest tags.
jlepere-everlaw Jul 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
73 changes: 45 additions & 28 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Build from source.
name: build
on: [push, pull_request]
permissions: read-all
jobs:
build_ubuntu:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand All @@ -22,11 +23,14 @@ jobs:
- architecture: 'x64'
compiler: 'gcc'
configure_options: '--enable-wide-character-type'
- architecture: 'x64'
compiler: 'gcc'
configure_options: '--with-zlib=no'
- architecture: 'x64'
compiler: 'gcc'
configure_options: '--enable-static-executables=yes --enable-multi-threading-support=no'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config zlib1g-dev
Expand All @@ -41,30 +45,46 @@ jobs:
- name: Run tests
run: |
tests/runtests.sh
build_dist:
runs-on: ubuntu-22.04
strategy:
matrix:
include:
- architecture: 'x64'
compiler: 'gcc'
configure_options: ''
steps:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config zlib1g-dev
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
- name: Building from source
env:
CC: ${{ matrix.compiler }}
run: |
tests/build.sh ${{ matrix.configure_options }}
- name: Run tests
run: |
make distcheck
build_python_ubuntu:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
include:
- architecture: 'x64'
compiler: 'gcc'
configure_options: '--enable-python'
python_version: ''
- architecture: 'x64'
compiler: 'gcc'
configure_options: '--enable-python2'
python_version: '2'
- architecture: 'x64'
compiler: 'gcc'
configure_options: '--enable-python3'
python_version: '3'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo add-apt-repository universe &&
sudo apt-get update &&
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config zlib1g-dev python2-dev python3-dev python-dev-is-python3
sudo apt-get -y install autoconf automake autopoint build-essential git 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 @@ -79,29 +99,25 @@ jobs:
run: |
tests/runtests.sh
build_setup_py_ubuntu:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
include:
- architecture: 'x64'
compiler: 'gcc'
configure_options: ''
python-version: 2.7
- architecture: 'x64'
compiler: 'gcc'
configure_options: ''
python-version: 3.8
python-version: '3.10'
steps:
- uses: actions/checkout@v2
- 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 git libtool pkg-config zlib1g-dev python2-dev python3-dev python-dev-is-python3
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config zlib1g-dev python3-dev python-dev-is-python3
- name: Building from source
env:
CC: ${{ matrix.compiler }}
Expand All @@ -111,7 +127,7 @@ jobs:
run: |
python setup.py build
coverage_ubuntu:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand All @@ -122,7 +138,7 @@ jobs:
compiler: 'gcc'
configure_options: '--enable-wide-character-type'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config zlib1g-dev
Expand All @@ -142,7 +158,8 @@ jobs:
for DIRECTORY in `find . -maxdepth 1 -type d`; do \
(cd ${DIRECTORY} && find . -maxdepth 1 -name \*.gcno -type f -exec gcov -pb {} \;) \
done
- name: Upload coverage data
run: |
git clone https://github.com/codecov/codecov-bash.git ../codecov-bash
/bin/bash ../codecov-bash/codecov -n linux-${{ matrix.architecture }}-gcc-no-optimization -X gcov;
- name: Upload coverage report to Codecov
uses: codecov/codecov-action@v4
with:
name: linux-${{ matrix.architecture }}-gcc-no-optimization
token: ${{ secrets.CODECOV_TOKEN }}
21 changes: 21 additions & 0 deletions .github/workflows/build_freebsd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Build from source on FreeBSD.
name: build_freebsd
on: [push]
permissions: read-all
jobs:
build_freebsd:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Building from source
id: build_freebsd
uses: vmactions/freebsd-vm@v1
with:
usesh: true
mem: 4096
# Note that the test scripts require bash
prepare: |
pkg install -y autoconf automake bash gettext git libtool pkgconf
run: |
tests/build.sh
tests/runtests.sh
5 changes: 3 additions & 2 deletions .github/workflows/build_shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ name: build_shared
on:
push:
branches: [main]
permissions: read-all
jobs:
build_shared_ubuntu:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand All @@ -16,7 +17,7 @@ jobs:
compiler: 'gcc'
configure_options: '--enable-wide-character-type'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config zlib1g-dev
Expand Down
42 changes: 42 additions & 0 deletions .github/workflows/build_wheel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Build wheel from source using tox.
name: build_wheel
on: [push, pull_request]
permissions: read-all
jobs:
build_wheel:
runs-on: ubuntu-22.04
strategy:
matrix:
include:
- python-version: '3.7'
toxenv: 'py37'
- python-version: '3.8'
toxenv: 'py38'
- python-version: '3.9'
toxenv: 'py39'
- python-version: '3.10'
toxenv: 'py310'
- python-version: '3.11'
toxenv: 'py311'
- python-version: '3.12'
toxenv: 'py312'
steps:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo add-apt-repository universe &&
sudo add-apt-repository -y ppa:deadsnakes/ppa &&
sudo apt-get update &&
sudo apt-get install -y autoconf automake autopoint build-essential git libtool pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-pip python3-setuptools
- name: Install tox
run: |
python3 -m pip install tox
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
- name: Prepare build
run: |
./synclibs.sh --use-head && ./autogen.sh && ./configure && make sources >/dev/null
- name: Build Python wheel
run: |
tox -e${{ matrix.toxenv }}
24 changes: 19 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Files to ignore by git
#
# Version: 20200912
# Version: 20231119

# Generic auto-generated build files
*~
Expand All @@ -25,10 +25,13 @@
*.swp
*.Tpo
*.trs
*.whl
/*.egg-info/
__pycache__
.deps
.dirstamp
.libs
.tox
INSTALL
Makefile
Makefile.bcc
Expand Down Expand Up @@ -82,6 +85,7 @@ stamp-h[1-9]
/m4/ltsugar.m4
/m4/ltversion.m4
/m4/nls.m4
/m4/pkg.m4
/m4/po.m4
/m4/printf-posix.m4
/m4/progtest.m4
Expand Down Expand Up @@ -123,39 +127,48 @@ stamp-h[1-9]
/libpff.spec
/libpff/libpff.rc
/libpff/libpff_definitions.h
/pypff-python[23]/*.[ch]
/setup.cfg
/jpff/classnoinst.stamp
/pfftools/*.exe
/pfftools/pffexport
/pfftools/pffinfo
/tests/*.exe
/tests/input
/tests/notify_stream.log
/tests/pff_test_allocation_table
/tests/pff_test_attached_file_io_handle
/tests/pff_test_attachment
/tests/pff_test_bit_stream
/tests/pff_test_block_descriptor
/tests/pff_test_block_tree
/tests/pff_test_block_tree_node
/tests/pff_test_checksum
/tests/pff_test_column_definition
/tests/pff_test_compression
/tests/pff_test_data_array
/tests/pff_test_data_array_entry
/tests/pff_test_data_block
/tests/pff_test_deflate
/tests/pff_test_descriptors_index
/tests/pff_test_encryption
/tests/pff_test_error
/tests/pff_test_file
/tests/pff_test_file_header
/tests/pff_test_folder
/tests/pff_test_free_map
/tests/pff_test_huffman_tree
/tests/pff_test_index
/tests/pff_test_index_node
/tests/pff_test_index_tree
/tests/pff_test_index_value
/tests/pff_test_io_handle
/tests/pff_test_io_handle2
/tests/pff_test_item
/tests/pff_test_item_descriptor
/tests/pff_test_item_tree
/tests/pff_test_item_values
/tests/pff_test_local_descriptor_node
/tests/pff_test_local_descriptor_value
/tests/pff_test_local_descriptors
/tests/pff_test_local_descriptors_node
/tests/pff_test_local_descriptors_tree
/tests/pff_test_mapi_value
/tests/pff_test_message
/tests/pff_test_multi_value
Expand All @@ -170,6 +183,7 @@ stamp-h[1-9]
/tests/pff_test_support
/tests/pff_test_table
/tests/pff_test_table_block_index
/tests/pff_test_table_header
/tests/pff_test_table_index_value
/tests/pff_test_tools_info_handle
/tests/pff_test_tools_output
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Acknowledgements: libpff

Copyright (C) 2008-2021, Joachim Metz <[email protected]>
Copyright (C) 2008-2024, Joachim Metz <[email protected]>

This code is derived from information and software contributed by:
* Earlier work on the PST file format in libpst by
Expand Down
Loading
Loading