Skip to content

Commit

Permalink
Disable hl tools by default HDFGroup#2313
Browse files Browse the repository at this point in the history
  • Loading branch information
byrnHDF committed Dec 16, 2022
1 parent 8f344f7 commit 983943a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 10 deletions.
6 changes: 2 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -834,14 +834,12 @@ AC_LANG_POP(C++)
AC_SUBST([HDF5_HL])
AC_SUBST([HDF5_HL_TOOLS])

## The high-level library and high-level tools are enabled unless the build mode
## The high-level library are enabled unless the build mode
## is clean.
if test "X-$BUILD_MODE" = "X-clean" ; then
HDF5_HL=no
HDF5_HL_TOOLS=no
else
HDF5_HL=yes
HDF5_HL_TOOLS=yes
fi

## high-level library directories (set when needed, blank until then)
Expand Down Expand Up @@ -877,7 +875,7 @@ AC_MSG_CHECKING([if the high-level tools are enabled])
AC_ARG_ENABLE([hltools],
[AS_HELP_STRING([--enable-hltools],
[Enable the high-level tools.
[default=yes]
[default=no]
])],
[HDF5_HL_TOOLS=$enableval])

Expand Down
2 changes: 1 addition & 1 deletion hl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if (HDF5_BUILD_TOOLS)
#-- Option to build the High level Tools
#-----------------------------------------------------------------------------
if (EXISTS "${HDF5_HL_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_HL_SOURCE_DIR}/tools")
option (HDF5_BUILD_HL_TOOLS "Build HDF5 HL Tools" ON)
option (HDF5_BUILD_HL_TOOLS "Build HDF5 HL Tools" OFF)
if (HDF5_BUILD_HL_TOOLS)
add_subdirectory (tools)
endif ()
Expand Down
2 changes: 1 addition & 1 deletion release_docs/INSTALL_CMake.txt
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ HDF5_BUILD_FORTRAN "Build FORTRAN support" OFF
HDF5_BUILD_JAVA "Build JAVA support" OFF
HDF5_BUILD_HL_LIB "Build HIGH Level HDF5 Library" ON
HDF5_BUILD_TOOLS "Build HDF5 Tools" ON
HDF5_BUILD_HL_TOOLS "Build HIGH Level HDF5 Tools" ON
HDF5_BUILD_HL_TOOLS "Build HIGH Level HDF5 Tools" OFF

---------------- HDF5 Folder Build Options ---------------------
Defaults relative to $<INSTALL_PREFIX>
Expand Down
16 changes: 12 additions & 4 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,14 @@ Bug Fixes since HDF5-1.13.3 release

Configuration
-------------
- Change the default for building the high-level tools

The gif2hdf5, hdf2gif and h5watch high-level tools are deprecated and will be removed
in a future release. The default build setting for them have been changed from enabled
to disabled. A user can enable the build of these tools if needed.

(ADB - 2022/12/16)

- Change the settings of the *pc files to use the correct format

The pkg-config files generated by CMake uses incorrect syntax for the 'Requires'
Expand Down Expand Up @@ -564,7 +572,7 @@ The issues with the gif tool are:
HDFFV-10592 CVE-2018-17433
HDFFV-10593 CVE-2018-17436
HDFFV-11048 CVE-2020-10809
These CVE issues have not yet been addressed and can be avoided by not building
the gif tool. Disable building the High-Level tools with these options:
autotools: --disable-hltools
cmake: HDF5_BUILD_HL_TOOLS=OFF
These CVE issues have not yet been addressed and are avoided by not building
the gif tool by default. Enable building the High-Level tools with these options:
autotools: --enable-hltools
cmake: HDF5_BUILD_HL_TOOLS=ON

0 comments on commit 983943a

Please sign in to comment.