Skip to content

Commit e129860

Browse files
t-wt-w
authored
Merge pull request #81 from lclevy/0.9.0
0.9.0
2 parents 32a679d + eb17741 commit e129860

File tree

212 files changed

+8361
-5036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+8361
-5036
lines changed

‎.github/workflows/autotools.yml

Lines changed: 61 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
conf_options: [ "", --enable-native-generic ]
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: install prereq.
2020
run: sudo apt-get update ; sudo apt-get install -y check
2121
- name: autogen
@@ -36,18 +36,34 @@ jobs:
3636
run: sudo ldconfig
3737
- name: test installed command-line utils
3838
run: ./examples/tests/test-all-examples.sh /usr/local/bin
39+
- name: store logs from failed tests
40+
if: failure()
41+
uses: actions/upload-artifact@v4
42+
with:
43+
name: ubuntu_autotools_logs_failed_tests
44+
path: |
45+
examples/tests/*.log
46+
regtests/Test/*.log
47+
tests/*.log
3948
40-
cygwin_native_default:
49+
cygwin:
4150
runs-on: windows-latest
4251
defaults:
4352
run:
44-
shell: C:\tools\cygwin\bin\bash.exe '{0}'
45-
env:
46-
SHELLOPTS: igncr
53+
shell: C:\cygwin\bin\bash.exe '{0}'
54+
# env:
55+
# SHELLOPTS: igncr
4756
steps:
48-
- uses: actions/checkout@v3
49-
- uses: egor-tensin/setup-cygwin@v4
57+
- name: setup git (eol)
58+
# shell: powershell
59+
shell: cmd
60+
run: |
61+
git config --global core.autocrlf false
62+
# git config --global core.eol lf
63+
- uses: actions/checkout@v4
64+
- uses: cygwin/cygwin-install-action@v4
5065
with:
66+
site: https://sunsite.icm.edu.pl/pub/cygnus/cygwin/
5167
packages: autoconf automake check diffutils findutils gcc-core grep gzip libtool make sed tar
5268
- name: autogen
5369
run: ./autogen.sh
@@ -57,15 +73,6 @@ jobs:
5773
run: make
5874
- name: make check
5975
run: make check
60-
- name: store logs from failed tests
61-
if: failure()
62-
uses: actions/upload-artifact@v3
63-
with:
64-
name: cygwin_native_logs_failed_tests
65-
path: |
66-
examples/tests/*.log
67-
regtests/Test/*.log
68-
tests/*.log
6976
- name: make distcheck
7077
run: make distcheck
7178
- name: make install
@@ -74,16 +81,26 @@ jobs:
7481
run: find /tmp/adflib -iname '*adf*'
7582
- name: test installed command-line utils
7683
run: ./examples/tests/test-all-examples.sh /tmp/adflib/bin
84+
- name: store logs from failed tests
85+
if: failure()
86+
uses: actions/upload-artifact@v4
87+
with:
88+
name: cygwin_autotools_native_logs_failed_tests
89+
path: |
90+
examples/tests/*.log
91+
regtests/Test/*.log
92+
tests/*.log
93+
# C:\cygwin\var\log\setup.log.full
7794

78-
msys2_native_default:
79-
if: false
95+
msys2:
96+
# if: false
8097
runs-on: windows-latest
8198
defaults:
8299
run:
83100
shell: msys2 '{0}'
84101
steps:
85-
- uses: actions/checkout@v3
86-
- uses: msys2/setup-msys2@v2
102+
- uses: actions/checkout@v4
103+
- uses: msys2/setup-msys2@v2.22.0
87104
with:
88105
update: true
89106
install: autotools diffutils mingw-w64-x86_64-check mingw-w64-x86_64-toolchain
@@ -94,7 +111,8 @@ jobs:
94111
- name: make
95112
run: make
96113
- name: make check
97-
run: ( make check || grep . examples/*.log examples/tests/*.log )
114+
#run: ( make check || grep . examples/*.log examples/tests/*.log )
115+
run: make check
98116
- name: make distcheck
99117
run: make distcheck
100118
- name: make install
@@ -103,13 +121,22 @@ jobs:
103121
run: find /tmp/adflib -iname '*adf*'
104122
- name: test installed command-line utils
105123
run: ./examples/tests/test-all-examples.sh /tmp/adflib/bin
124+
- name: store logs from failed tests
125+
if: failure()
126+
uses: actions/upload-artifact@v4
127+
with:
128+
name: msys2_autotools_logs_failed_tests
129+
path: |
130+
examples/tests/*.log
131+
regtests/Test/*.log
132+
tests/*.log
106133
107-
macos_native_default:
134+
macos:
108135
runs-on: macos-latest
109136
steps:
110-
- uses: actions/checkout@v3
137+
- uses: actions/checkout@v4
111138
- name: install prereq.
112-
run: brew install automake check
139+
run: brew install automake check libtool
113140
- name: autogen
114141
run: ./autogen.sh
115142
- name: configure
@@ -121,8 +148,17 @@ jobs:
121148
- name: make distcheck
122149
run: make distcheck
123150
- name: make install
124-
run: make install
151+
run: sudo make install
125152
- name: check installation
126153
run: find /usr/local/ -iname '*adf*'
127154
- name: test installed command-line utils
128155
run: ./examples/tests/test-all-examples.sh /usr/local/bin
156+
- name: store logs from failed tests
157+
if: failure()
158+
uses: actions/upload-artifact@v4
159+
with:
160+
name: macos_autotools_native_logs_failed_tests
161+
path: |
162+
examples/tests/*.log
163+
regtests/Test/*.log
164+
tests/*.log

‎.github/workflows/cmake.yml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
build_type: [ shared, debug ]
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: install prereq.
2020
run: sudo apt-get update ; sudo apt-get install -y check
2121
- name: cmake_${{ matrix.build_type }}_configure
@@ -36,7 +36,7 @@ jobs:
3636
windows_build:
3737
runs-on: windows-latest
3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
- name: install prereq.
4141
run: |
4242
choco install ninja cmake
@@ -94,7 +94,7 @@ jobs:
9494
run: |
9595
echo $ADFLIB_TAG
9696
echo ${{ env.ADFLIB_TAG }}
97-
- uses: actions/upload-artifact@v3
97+
- uses: actions/upload-artifact@v4
9898
with:
9999
# name: adflib-${{ env.ADFLIB_TAG }}-windows
100100
name: adflib-windows
@@ -105,7 +105,7 @@ jobs:
105105
run: |
106106
mkdir -v artifact-tests
107107
tar cvzf artifact-tests/examples_tests.tgz examples/tests/
108-
- uses: actions/upload-artifact@v3
108+
- uses: actions/upload-artifact@v4
109109
with:
110110
name: adflib-windows-examples-tests
111111
path: |
@@ -115,15 +115,15 @@ jobs:
115115
runs-on: windows-latest
116116
needs: windows_build
117117
steps:
118-
- uses: actions/download-artifact@v3
118+
- uses: actions/download-artifact@v4
119119
with:
120120
# name: adflib-${{ env.ADFLIB_TAG }}-windows
121121
name: adflib-windows
122122
path: .
123123
- name: list files extracted from the artifact
124124
shell: bash
125125
run: find .
126-
- uses: actions/download-artifact@v3
126+
- uses: actions/download-artifact@v4
127127
with:
128128
name: adflib-windows-examples-tests
129129
path: .
@@ -141,7 +141,7 @@ jobs:
141141
macos_shared:
142142
runs-on: macos-latest
143143
steps:
144-
- uses: actions/checkout@v3
144+
- uses: actions/checkout@v4
145145
- name: install prereq.
146146
run: |
147147
brew install cmake ninja coreutils
@@ -154,6 +154,8 @@ jobs:
154154
run: util/cmake_shared_build
155155
- name: cmake_shared_test
156156
run: util/cmake_shared_test
157+
- name: show properties of binaries in the build tree (not installed)
158+
run: otool -l build/shared/examples/unadf
157159
- name: cmake_shared_install
158160
run: sudo bash util/cmake_shared_install
159161
- name: check installation
@@ -168,7 +170,7 @@ jobs:
168170
/usr/local/include/*adf*
169171
/usr/local/lib/*adf*
170172
# /usr/local/share/man/man3/*adf*
171-
- uses: actions/upload-artifact@v3
173+
- uses: actions/upload-artifact@v4
172174
with:
173175
# name: adflib-${{ env.ADFLIB_TAG }}-windows
174176
name: adflib-macos
@@ -178,7 +180,7 @@ jobs:
178180
run: |
179181
mkdir -v artifact-tests
180182
tar cvzf artifact-tests/examples_tests.tgz examples/tests/
181-
- uses: actions/upload-artifact@v3
183+
- uses: actions/upload-artifact@v4
182184
with:
183185
name: adflib-macos-examples-tests
184186
path: |
@@ -189,16 +191,22 @@ jobs:
189191
needs: macos_shared
190192
runs-on: macos-latest
191193
steps:
192-
- uses: actions/download-artifact@v3
194+
- uses: actions/download-artifact@v4
193195
with:
194196
# name: adflib-${{ env.ADFLIB_TAG }}-macos
195197
name: adflib-macos
196198
path: .
197199
- name: extract file from the artifact
198-
run: tar xzv -C / -f adflib-macos.tgz
200+
run: sudo tar xzv -C / -f adflib-macos.tgz
199201
- name: list files extracted from the artifact
200202
run: find /usr/local -name "*adf*"
201-
- uses: actions/download-artifact@v3
203+
- name: list installed library files
204+
run: ls -l /usr/local/lib/*adf*
205+
# - name: update dyld's shared cache
206+
# run: sudo update_dyld_shared_cache -debug
207+
- name: show properties of binaries (installed)
208+
run: otool -l /usr/local/bin/unadf
209+
- uses: actions/download-artifact@v4
202210
with:
203211
name: adflib-macos-examples-tests
204212
path: .

‎.github/workflows/deb-debian.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
container:
1919
image: debian:${{ matrix.image }}
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- name: install prereq.
2323
run:
2424
apt-get update &&
@@ -39,7 +39,7 @@ jobs:
3939
# run: |
4040
# echo $ADFLIB_TAG
4141
# echo ${{ env.ADFLIB_TAG }}
42-
- uses: actions/upload-artifact@v3
42+
- uses: actions/upload-artifact@v4
4343
with:
4444
# name: adflib-${{ env.ADFLIB_TAG }}-deb-debian
4545
name: adflib-debian-${{ matrix.image }}
@@ -49,7 +49,7 @@ jobs:
4949
run: |
5050
mkdir -v artifact-tests
5151
tar cvzf artifact-tests/examples_tests.tgz examples/tests/
52-
- uses: actions/upload-artifact@v3
52+
- uses: actions/upload-artifact@v4
5353
with:
5454
name: adflib-examples-tests-${{ matrix.image }}
5555
path: |
@@ -64,7 +64,7 @@ jobs:
6464
container:
6565
image: debian:${{ matrix.image }}
6666
steps:
67-
- uses: actions/download-artifact@v3
67+
- uses: actions/download-artifact@v4
6868
with:
6969
# name: adflib-${{ env.ADFLIB_TAG }}-deb-debian
7070
name: adflib-debian-${{ matrix.image }}
@@ -84,7 +84,7 @@ jobs:
8484
dpkg -l 'libadf*' ;
8585
dpkg -l 'libadf*' | grep "libadf" |
8686
cut -d' ' -f 3 | cut -d':' -f 1 | xargs dpkg -L
87-
- uses: actions/download-artifact@v3
87+
- uses: actions/download-artifact@v4
8888
with:
8989
# name: adflib-${{ env.ADFLIB_TAG }}-deb-debian
9090
name: adflib-examples-tests-${{ matrix.image }}

‎.github/workflows/deb-ubuntu.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@ name: deb packaging Ubuntu
22

33
on:
44
push:
5-
branches: [ "master", "devel", "citest", "citest-deb" ]
5+
# branches: [ "master", "devel", "citest", "citest-deb" ]
6+
branches: [ "citest", "citest-deb" ]
67
tags:
78
- '**'
8-
pull_request:
9-
branches: [ "master", "devel" ]
9+
# pull_request:
10+
# branches: [ "master", "devel" ]
1011

1112
jobs:
1213
build:
1314
runs-on: ubuntu-latest
1415
steps:
15-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1617
- name: install prereq.
1718
run:
1819
sudo apt-get update &&
@@ -33,7 +34,7 @@ jobs:
3334
run: |
3435
echo $ADFLIB_TAG
3536
echo ${{ env.ADFLIB_TAG }}
36-
- uses: actions/upload-artifact@v3
37+
- uses: actions/upload-artifact@v4
3738
with:
3839
# name: adflib-${{ env.ADFLIB_TAG }}-deb-ubuntu
3940
name: adflib-deb-ubuntu
@@ -43,7 +44,7 @@ jobs:
4344
run: |
4445
mkdir -v artifact-tests
4546
tar cvzf artifact-tests/examples_tests.tgz examples/tests/
46-
- uses: actions/upload-artifact@v3
47+
- uses: actions/upload-artifact@v4
4748
with:
4849
name: adflib-examples-tests
4950
path: |
@@ -53,7 +54,7 @@ jobs:
5354
needs: build
5455
runs-on: ubuntu-latest
5556
steps:
56-
- uses: actions/download-artifact@v3
57+
- uses: actions/download-artifact@v4
5758
with:
5859
# name: adflib-${{ env.ADFLIB_TAG }}-deb-ubuntu
5960
name: adflib-deb-ubuntu
@@ -68,7 +69,7 @@ jobs:
6869
dpkg -l 'libadf*' ;
6970
dpkg -l 'libadf*' | grep "libadf" |
7071
cut -d' ' -f 3 | cut -d':' -f 1 | xargs dpkg -L
71-
- uses: actions/download-artifact@v3
72+
- uses: actions/download-artifact@v4
7273
with:
7374
# name: adflib-${{ env.ADFLIB_TAG }}-deb-ubuntu
7475
name: adflib-examples-tests

‎AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ and:
3333
Daniel Collin <daniel@collin.com>
3434
David O'Rourke <carbon14@submarine.org.uk>
3535
Kalamatee <kalamatee@gmail.com>
36+
Didier Malenfant <didier@malenfant.net>
3637
Nikos Chantziaras <realnc@gmail.com>
3738
polluks <polluks@sdf.lonestar.org>
3839
Ralf Hoffmann <ralf@boomerangsworld.de>

‎BUGS.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
2+
## Possible bugs
3+
- in dircache updates
4+
5+
6+
## Past security bugs
7+
8+
Please note that several security issues/bugs has been found in the older (0.7.x)
9+
versions of the ADFlib:
10+
- `CVE-2016-1243` and `CVE-2016-1244`, fixed in
11+
[8e973d7](https://github.com/lclevy/ADFlib/commit/8e973d7b894552c3a3de0ccd2d1e9cb0b8e618dd)),
12+
(found in Debian version `unadf/0.7.11a-3`, fixed in versions `unadf/0.7.11a-4`,
13+
`unadf/0.7.11a-3+deb8u1`). See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838248
14+
- Stuart Caie fixed arbitrary directory traversal in
15+
[4ce14b2](https://github.com/lclevy/ADFlib/commit/4ce14b2a8b6db84954cf9705459eafebabecf3e4)
16+
lines 450-455
17+
18+
**Please update to the latest released version where these,
19+
as well as many other things, are fixed.**

0 commit comments

Comments
 (0)