Skip to content

Commit e47faca

Browse files
LiberalArtistburgerrg
authored andcommitted
update zlib to v1.2.12, fixing CVE-2018-25032
1 parent c81e788 commit e47faca

File tree

10 files changed

+11
-9
lines changed

10 files changed

+11
-9
lines changed

LOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,3 +2282,5 @@
22822282
c/thread.c mats/foreign3.c s/mkheader.ss
22832283
- update lz4 to version 1.9.3
22842284
configure
2285+
- update zlib to version 1.2.12 (which fixes CVE-2018-25032)
2286+
configure c/Mf-*le

c/Mf-a6le

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
4040
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
4141

4242
../zlib/configure.log:
43-
(cd ../zlib; CFLAGS="${CFLAGS} -m64" ./configure --64)
43+
(cd ../zlib; CFLAGS="${CFLAGS} -m64 -fPIC" ./configure --64)
4444

4545
../lz4/lib/liblz4.a: ${LZ4Sources}
4646
(cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a)

c/Mf-arm32le

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
4040
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
4141

4242
../zlib/configure.log:
43-
(cd ../zlib; ./configure)
43+
(cd ../zlib; CFLAGS="${CFLAGS} -fPIC" ./configure)
4444

4545
../lz4/lib/liblz4.a: ${LZ4Sources}
4646
(cd ../lz4/lib; ${MAKE} liblz4.a)

c/Mf-i3le

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
4040
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
4141

4242
../zlib/configure.log:
43-
(cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure)
43+
(cd ../zlib; CFLAGS="${CFLAGS} -m32 -fPIC" ./configure)
4444

4545
../lz4/lib/liblz4.a: ${LZ4Sources}
4646
(cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a)

c/Mf-ppc32le

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
4040
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
4141

4242
../zlib/configure.log:
43-
(cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure)
43+
(cd ../zlib; CFLAGS="${CFLAGS} -m32 -fPIC" ./configure)
4444

4545
../lz4/lib/liblz4.a: ${LZ4Sources}
4646
(cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a)

c/Mf-ta6le

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
4040
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
4141

4242
../zlib/configure.log:
43-
(cd ../zlib; CFLAGS="${CFLAGS} -m64" ./configure --64)
43+
(cd ../zlib; CFLAGS="${CFLAGS} -m64 -fPIC" ./configure --64)
4444

4545
../lz4/lib/liblz4.a: ${LZ4Sources}
4646
(cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a)

c/Mf-ti3le

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
4040
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
4141

4242
../zlib/configure.log:
43-
(cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure)
43+
(cd ../zlib; CFLAGS="${CFLAGS} -m32 -fPIC" ./configure)
4444

4545
../lz4/lib/liblz4.a: ${LZ4Sources}
4646
(cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a)

c/Mf-tppc32le

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
4040
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
4141

4242
../zlib/configure.log:
43-
(cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure)
43+
(cd ../zlib; CFLAGS="${CFLAGS} -m32 -fPIC" ./configure)
4444

4545
../lz4/lib/liblz4.a: ${LZ4Sources}
4646
(cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a)

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ else
420420
if [ "${zlibDep}" != "" ] ; then
421421
if [ ! -f 'zlib/configure' ] ; then
422422
rmdir zlib > /dev/null 2>&1
423-
(curl -L -o v1.2.11.tar.gz https://github.com/madler/zlib/archive/v1.2.11.tar.gz && tar -xzf v1.2.11.tar.gz && mv zlib-1.2.11 zlib && rm v1.2.11.tar.gz) || exit 1
423+
(curl -L -o v1.2.12.tar.gz https://github.com/madler/zlib/archive/v1.2.12.tar.gz && tar -xzf v1.2.12.tar.gz && mv zlib-1.2.12 zlib && rm v1.2.12.tar.gz) || exit 1
424424
fi
425425
fi
426426

zlib

Submodule zlib updated 86 files

0 commit comments

Comments
 (0)