Merge branch 'develop' into hdf5_1_10.sync

2 files changed, 47 insertions, 36 deletions

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 642f75c..e73f788 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -4,38 +4,30 @@ HDF5 version 1.10.3-snap1 currently under development
 
 INTRODUCTION
 
-This document describes the differences between HDF5-1.10.1 and HDF5 1.10.2, and
-contains information on the platforms tested and known problems in HDF5-1.10.1.
-For more details check the HISTORY*.txt files in the HDF5 source.
+This document describes the differences between this release and the previous
+HDF5 release. It contains information on the platforms tested and known
+problems in this release. For more details check the HISTORY*.txt files in the
+HDF5 source.
 
+Note that documentation in the links below will be updated at the time of each
+final release.
 
-Links to HDF5 1.10.1 source code, documentation, and additional materials can be found on The HDF5 web page at:
+Links to HDF5 documentation can be found on The HDF5 web page:
 
-     https://support.hdfgroup.org/HDF5/
+     https://portal.hdfgroup.org/display/HDF5/HDF5
 
-The HDF5 1.10.1 release can be obtained from:
+The official HDF5 releases can be obtained from:
 
-     https://support.hdfgroup.org/HDF5/release/obtain5.html
+     https://www.hdfgroup.org/downloads/hdf5/
 
-User documentation for the snapshot can be accessed directly at this location:
+Changes from Release to Release and New Features in the HDF5-1.10.x release series
+can be found at:
 
-     https://support.hdfgroup.org/HDF5/doc/
-
-New features in the HDF5-1.10.x release series, including brief general
-descriptions of some new and modified APIs, are described in the "New Features
-in HDF5 1.10" document:
-
-https://support.hdfgroup.org/HDF5/docNewFeatures/index.html
-
-All new and modified APIs are listed in detail in the "HDF5 Software Changes
-from Release to Release" document, in the section "Release 1.10.1 (current
-release) versus Release 1.10.0
-
-     https://support.hdfgroup.org/HDF5/doc/ADGuide/Changes.html
+     https://portal.hdfgroup.org/display/HDF5/HDF5+Application+Developer%27s+Guide
 
 If you have any questions or comments, please send them to the HDF Help Desk:
 
-    help@hdfgroup.org
+     help@hdfgroup.org
 
 
 CONTENTS
@@ -54,18 +46,16 @@ New Features
 
     Configuration:
     -------------
-    -
-
+    - 
 
     Library:
     --------
-    -
+    - 
 
 
     Parallel Library:
     -----------------
-    -
-
+    - 
 
     Fortran Library:
     ----------------
@@ -76,7 +66,6 @@ New Features
     ------------
     -
 
-
     Java Library:
     ----------------
     -
@@ -110,7 +99,26 @@ Bug Fixes since HDF5-1.10.2 release
 
     Library
     -------
-    -
+    - If an HDF5 file contains a malformed compound datatype with a
+      suitably large offset, the type conversion code can run off
+      the end of the type conversion buffer, causing a segmentation
+      fault.
+
+      This issue was reported to The HDF Group as issue #CVE-2017-17507.
+
+      NOTE: The HDF5 C library cannot produce such a file. This condition
+            should only occur in a corrupt (or deliberately altered) file
+            or a file created by third-party software.
+
+      THE HDF GROUP WILL NOT FIX THIS BUG AT THIS TIME
+
+      Fixing this problem would involve updating the publicly visible
+      H5T_conv_t function pointer typedef and versioning the API calls
+      which use it. We normally only modify the public API during
+      major releases, so this bug will not be fixed at this time.
+
+      (DER - 2018/02/26, HDFFV-10356)
+
 
     Configuration
     -------------
@@ -163,8 +171,8 @@ Supported Platforms
 
     Linux 3.10.0-327.10.1.el7   GNU C (gcc), Fortran (gfortran), C++ (g++)
     #1 SMP x86_64 GNU/Linux       compilers:
-    (kituo/moohan)                  Version 4.8.5 20150623 (Red Hat 4.8.5-4)
-                                    Version 4.9.3, Version 5.2.0
+    (kituo/moohan)                Version 4.8.5 20150623 (Red Hat 4.8.5-4)
+                                    Version 4.9.3, Version 5.2.0,
                                   Intel(R) C (icc), C++ (icpc), Fortran (icc)
                                   compilers:
                                      Version 17.0.0.098 Build 20160721
@@ -200,7 +208,11 @@ Supported Platforms
 
     Mac OS X El Capitan 10.11.6   Apple clang/clang++ version 7.3.0 from Xcode 7.3
     64-bit                        gfortran GNU Fortran (GCC) 5.2.0
-    (osx1010dev/osx1010test)      Intel icc/icpc/ifort version 16.0.2
+    (osx1011dev/osx1011test)      Intel icc/icpc/ifort version 16.0.2
+
+    Mac OS Sierra 10.12.6         Apple LLVM version 8.1.0 (clang/clang++-802.0.42)
+    64-bit                        gfortran GNU Fortran (GCC) 7.1.0
+    (swallow/kite)                Intel icc/icpc/ifort version 17.0.2
 
     Mac OS Sierra 10.12.6         Apple LLVM version 8.1.0 (clang/clang++-802.0.42)
     64-bit                        gfortran GNU Fortran (GCC) 7.1.0
@@ -280,12 +292,11 @@ The following platforms are not supported but have been tested for this release.
 
     Linux 3.10.0-327.18.2.el7     GNU C (gcc) and C++ (g++) compilers
     #1 SMP x86_64 GNU/Linux          Version 4.8.5 20150623 (Red Hat 4.8.5-4)
-    (jelly)                       with NAG Fortran Compiler Release 6.1(Tozai
-)
+    (jelly)                       with NAG Fortran Compiler Release 6.1(Tozai)
                                   GCC Version 7.1.0
                                   OpenMPI 3.0.0-GCC-7.2.0-2.29
                                   Intel(R) C (icc) and C++ (icpc) compilers
-                                     Version 17.0.7.098 (Build 20160721)
+                                     Version 17.0.0.098 Build 20160721
                                   with NAG Fortran Compiler Release 6.1(Tozai)
 
     Linux 3.10.0-327.10.1.el7     MPICH 3.2 compiled with GCC 5.3.0
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index 169a06f..1c38c84 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -188,7 +188,7 @@ string(TOLOWER ${LIB_TYPE} SEARCH_TYPE)
 
 find_package (HDF5 NAMES hdf5 COMPONENTS C ${SEARCH_TYPE})
 # find_package (HDF5) # Find non-cmake built HDF5
-INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIR})
+set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${HDF5_INCLUDE_DIR}")
 set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_${LIB_TYPE}_LIBRARY})
 
 set (example hdf_example)