Skip to content

Commit

Permalink
Merge pull request #80 from t-w/0.9.0
Browse files Browse the repository at this point in the history
0.9.0
  • Loading branch information
t-w authored May 16, 2024
2 parents 32a679d + 2672c5d commit c385116
Show file tree
Hide file tree
Showing 212 changed files with 8,351 additions and 5,033 deletions.
86 changes: 61 additions & 25 deletions .github/workflows/autotools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
conf_options: [ "", --enable-native-generic ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install prereq.
run: sudo apt-get update ; sudo apt-get install -y check
- name: autogen
Expand All @@ -36,18 +36,34 @@ jobs:
run: sudo ldconfig
- name: test installed command-line utils
run: ./examples/tests/test-all-examples.sh /usr/local/bin
- name: store logs from failed tests
if: failure()
uses: actions/upload-artifact@v4
with:
name: ubuntu_autotools_logs_failed_tests
path: |
examples/tests/*.log
regtests/Test/*.log
tests/*.log
cygwin_native_default:
cygwin:
runs-on: windows-latest
defaults:
run:
shell: C:\tools\cygwin\bin\bash.exe '{0}'
env:
SHELLOPTS: igncr
shell: C:\cygwin\bin\bash.exe '{0}'
# env:
# SHELLOPTS: igncr
steps:
- uses: actions/checkout@v3
- uses: egor-tensin/setup-cygwin@v4
- name: setup git (eol)
# shell: powershell
shell: cmd
run: |
git config --global core.autocrlf false
# git config --global core.eol lf
- uses: actions/checkout@v4
- uses: cygwin/cygwin-install-action@v4
with:
site: https://sunsite.icm.edu.pl/pub/cygnus/cygwin/
packages: autoconf automake check diffutils findutils gcc-core grep gzip libtool make sed tar
- name: autogen
run: ./autogen.sh
Expand All @@ -57,15 +73,6 @@ jobs:
run: make
- name: make check
run: make check
- name: store logs from failed tests
if: failure()
uses: actions/upload-artifact@v3
with:
name: cygwin_native_logs_failed_tests
path: |
examples/tests/*.log
regtests/Test/*.log
tests/*.log
- name: make distcheck
run: make distcheck
- name: make install
Expand All @@ -74,16 +81,26 @@ jobs:
run: find /tmp/adflib -iname '*adf*'
- name: test installed command-line utils
run: ./examples/tests/test-all-examples.sh /tmp/adflib/bin
- name: store logs from failed tests
if: failure()
uses: actions/upload-artifact@v4
with:
name: cygwin_autotools_native_logs_failed_tests
path: |
examples/tests/*.log
regtests/Test/*.log
tests/*.log
# C:\cygwin\var\log\setup.log.full

msys2_native_default:
if: false
msys2:
# if: false
runs-on: windows-latest
defaults:
run:
shell: msys2 '{0}'
steps:
- uses: actions/checkout@v3
- uses: msys2/setup-msys2@v2
- uses: actions/checkout@v4
- uses: msys2/setup-msys2@v2.22.0
with:
update: true
install: autotools diffutils mingw-w64-x86_64-check mingw-w64-x86_64-toolchain
Expand All @@ -94,7 +111,8 @@ jobs:
- name: make
run: make
- name: make check
run: ( make check || grep . examples/*.log examples/tests/*.log )
#run: ( make check || grep . examples/*.log examples/tests/*.log )
run: make check
- name: make distcheck
run: make distcheck
- name: make install
Expand All @@ -103,13 +121,22 @@ jobs:
run: find /tmp/adflib -iname '*adf*'
- name: test installed command-line utils
run: ./examples/tests/test-all-examples.sh /tmp/adflib/bin
- name: store logs from failed tests
if: failure()
uses: actions/upload-artifact@v4
with:
name: msys2_autotools_logs_failed_tests
path: |
examples/tests/*.log
regtests/Test/*.log
tests/*.log
macos_native_default:
macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install prereq.
run: brew install automake check
run: brew install automake check libtool
- name: autogen
run: ./autogen.sh
- name: configure
Expand All @@ -121,8 +148,17 @@ jobs:
- name: make distcheck
run: make distcheck
- name: make install
run: make install
run: sudo make install
- name: check installation
run: find /usr/local/ -iname '*adf*'
- name: test installed command-line utils
run: ./examples/tests/test-all-examples.sh /usr/local/bin
- name: store logs from failed tests
if: failure()
uses: actions/upload-artifact@v4
with:
name: macos_autotools_native_logs_failed_tests
path: |
examples/tests/*.log
regtests/Test/*.log
tests/*.log
32 changes: 20 additions & 12 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
build_type: [ shared, debug ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install prereq.
run: sudo apt-get update ; sudo apt-get install -y check
- name: cmake_${{ matrix.build_type }}_configure
Expand All @@ -36,7 +36,7 @@ jobs:
windows_build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install prereq.
run: |
choco install ninja cmake
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
run: |
echo $ADFLIB_TAG
echo ${{ env.ADFLIB_TAG }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
# name: adflib-${{ env.ADFLIB_TAG }}-windows
name: adflib-windows
Expand All @@ -105,7 +105,7 @@ jobs:
run: |
mkdir -v artifact-tests
tar cvzf artifact-tests/examples_tests.tgz examples/tests/
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: adflib-windows-examples-tests
path: |
Expand All @@ -115,15 +115,15 @@ jobs:
runs-on: windows-latest
needs: windows_build
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
# name: adflib-${{ env.ADFLIB_TAG }}-windows
name: adflib-windows
path: .
- name: list files extracted from the artifact
shell: bash
run: find .
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: adflib-windows-examples-tests
path: .
Expand All @@ -141,7 +141,7 @@ jobs:
macos_shared:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install prereq.
run: |
brew install cmake ninja coreutils
Expand All @@ -154,6 +154,8 @@ jobs:
run: util/cmake_shared_build
- name: cmake_shared_test
run: util/cmake_shared_test
- name: show properties of binaries in the build tree (not installed)
run: otool -l build/shared/examples/unadf
- name: cmake_shared_install
run: sudo bash util/cmake_shared_install
- name: check installation
Expand All @@ -168,7 +170,7 @@ jobs:
/usr/local/include/*adf*
/usr/local/lib/*adf*
# /usr/local/share/man/man3/*adf*
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
# name: adflib-${{ env.ADFLIB_TAG }}-windows
name: adflib-macos
Expand All @@ -178,7 +180,7 @@ jobs:
run: |
mkdir -v artifact-tests
tar cvzf artifact-tests/examples_tests.tgz examples/tests/
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: adflib-macos-examples-tests
path: |
Expand All @@ -189,16 +191,22 @@ jobs:
needs: macos_shared
runs-on: macos-latest
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
# name: adflib-${{ env.ADFLIB_TAG }}-macos
name: adflib-macos
path: .
- name: extract file from the artifact
run: tar xzv -C / -f adflib-macos.tgz
run: sudo tar xzv -C / -f adflib-macos.tgz
- name: list files extracted from the artifact
run: find /usr/local -name "*adf*"
- uses: actions/download-artifact@v3
- name: list installed library files
run: ls -l /usr/local/lib/*adf*
# - name: update dyld's shared cache
# run: sudo update_dyld_shared_cache -debug
- name: show properties of binaries (installed)
run: otool -l /usr/local/bin/unadf
- uses: actions/download-artifact@v4
with:
name: adflib-macos-examples-tests
path: .
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deb-debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
container:
image: debian:${{ matrix.image }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install prereq.
run:
apt-get update &&
Expand All @@ -39,7 +39,7 @@ jobs:
# run: |
# echo $ADFLIB_TAG
# echo ${{ env.ADFLIB_TAG }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
# name: adflib-${{ env.ADFLIB_TAG }}-deb-debian
name: adflib-debian-${{ matrix.image }}
Expand All @@ -49,7 +49,7 @@ jobs:
run: |
mkdir -v artifact-tests
tar cvzf artifact-tests/examples_tests.tgz examples/tests/
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: adflib-examples-tests-${{ matrix.image }}
path: |
Expand All @@ -64,7 +64,7 @@ jobs:
container:
image: debian:${{ matrix.image }}
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
# name: adflib-${{ env.ADFLIB_TAG }}-deb-debian
name: adflib-debian-${{ matrix.image }}
Expand All @@ -84,7 +84,7 @@ jobs:
dpkg -l 'libadf*' ;
dpkg -l 'libadf*' | grep "libadf" |
cut -d' ' -f 3 | cut -d':' -f 1 | xargs dpkg -L
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
# name: adflib-${{ env.ADFLIB_TAG }}-deb-debian
name: adflib-examples-tests-${{ matrix.image }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deb-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install prereq.
run:
sudo apt-get update &&
Expand All @@ -33,7 +33,7 @@ jobs:
run: |
echo $ADFLIB_TAG
echo ${{ env.ADFLIB_TAG }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
# name: adflib-${{ env.ADFLIB_TAG }}-deb-ubuntu
name: adflib-deb-ubuntu
Expand All @@ -43,7 +43,7 @@ jobs:
run: |
mkdir -v artifact-tests
tar cvzf artifact-tests/examples_tests.tgz examples/tests/
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: adflib-examples-tests
path: |
Expand All @@ -53,7 +53,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
# name: adflib-${{ env.ADFLIB_TAG }}-deb-ubuntu
name: adflib-deb-ubuntu
Expand All @@ -68,7 +68,7 @@ jobs:
dpkg -l 'libadf*' ;
dpkg -l 'libadf*' | grep "libadf" |
cut -d' ' -f 3 | cut -d':' -f 1 | xargs dpkg -L
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
# name: adflib-${{ env.ADFLIB_TAG }}-deb-ubuntu
name: adflib-examples-tests
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ and:
Daniel Collin <daniel@collin.com>
David O'Rourke <carbon14@submarine.org.uk>
Kalamatee <kalamatee@gmail.com>
Didier Malenfant <didier@malenfant.net>
Nikos Chantziaras <realnc@gmail.com>
polluks <polluks@sdf.lonestar.org>
Ralf Hoffmann <ralf@boomerangsworld.de>
Expand Down
19 changes: 19 additions & 0 deletions BUGS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

## Possible bugs
- in dircache updates


## Past security bugs

Please note that several security issues/bugs has been found in the older (0.7.x)
versions of the ADFlib:
- `CVE-2016-1243` and `CVE-2016-1244`, fixed in
[8e973d7](https://github.com/lclevy/ADFlib/commit/8e973d7b894552c3a3de0ccd2d1e9cb0b8e618dd)),
(found in Debian version `unadf/0.7.11a-3`, fixed in versions `unadf/0.7.11a-4`,
`unadf/0.7.11a-3+deb8u1`). See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838248
- Stuart Caie fixed arbitrary directory traversal in
[4ce14b2](https://github.com/lclevy/ADFlib/commit/4ce14b2a8b6db84954cf9705459eafebabecf3e4)
lines 450-455

**Please update to the latest released version where these,
as well as many other things, are fixed.**
Loading

0 comments on commit c385116

Please sign in to comment.