Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)

* commit 'cf110b33c825f15e8a101b5772d15ec282ff85bf': (105 commits)
  Unify the test (t_bigio.c) between hdf5_1_10 and develop
  Remove comparison to NULL for variables to be freed.
  Add HDfree of vector, matrix_out and matrix_out1 previously HDmalloced in coll_write_test().
  merged from develop
  merged from develop
  removed duplicate code
  Code improvement Description:     - Removed memory leaks caused by accidentally invoking p_get_member_type     - Added the call to test_lcpl, missed previously Platforms tested:     Linux/64 (jelly)     Linux/ppc64 (ostrich)     Darwin (osx1010test)
  Updated RELEASE.txt Description:     - Wrappers for H5Lcreate_soft, H5Lcreate_hard, H5Lcopy, H5Lmove,       H5Ldelete, and H5Lget_info     - Class LinkCreatPropList     - Fixed typo in source file Platforms tested:     Linux/64 (jelly)
  Updated for H5LcreatProp.[h,cpp]
  Updated MANIFEST for H5LcreatProp.[h,cpp]
  HDFFV-10149 continued Description:     - Moved the new wrappers committed on Mar 9:         43158f3bb352f374c31556a5d0dc463a09e0b32e       to H5Location and renamed some of them for overloading.       This is because the loc_id in the C APIs can be file, group, dataset,       named datatype, and attribute.  Previous implementation was wrong       following some inaccurate C API reference manual.
  Re-factor coding for H5P/Sencode with libver bounds.
  Removed commented out code from H5FDmpio.c, H5FDprivate.h and H5Fint.c
  Upated cpp doc.
  Added C++ wrappers - HDFFV-10149 Description:     Added the following wrappers to class H5::Group:     + H5Lcreate_soft:         // Creates a soft link from link_name to target_name.         void newLink(const char *target_name, const char *link_name,...)         void newLink(const H5std_string& target_name,...)
  Improve code Description:     Added notes and changed argument to H5Fcreate to clarify the     latest situation Platforms tested:     Linux/64 (jelly)
  Resolve compilation errors.
  Add release note
  Remove obsolete comments
  Change CMake min to 3.10
  ...

4 files changed, 172 insertions, 25 deletions

diff --git a/release_docs/INSTALL b/release_docs/INSTALL
index 2dcb9be..3709a58 100644
--- a/release_docs/INSTALL
+++ b/release_docs/INSTALL
@@ -305,7 +305,7 @@ CONTENTS
         to enable symbolic debugging of a production version of HDF5, one
         might say:
 
-            $ CFLAGS=-g ./configure --enable-production
+            $ CFLAGS=-g ./configure --enable-build-mode=production
 
 4.3.5. Compiling HDF5 wrapper libraries
         One can optionally build the Fortran and/or C++ interfaces to the
@@ -414,35 +414,35 @@ CONTENTS
         The library can be compiled to provide symbolic debugging support
         so it can be debugged with gdb, dbx, ddd, etc., or it can be
         compiled with various optimizations. To compile for symbolic
-        debugging (the default for snapshots), say `--disable-production';
-        to compile with optimizations (the default for supported public
-        releases), say `--enable-production'. On some systems the library
-        can also be compiled for profiling with gprof by saying
+        debugging (the default for snapshots), say 
+        `--enable-build-mode=production'; to compile with optimizations 
+        (the default for supported public releases), 
+        say `--enable-build-mode=production'. On some systems the 
+        library can also be compiled for profiling with gprof by saying
         `--enable-production=profile'.
 
-            $ ./configure --disable-production         #symbolic debugging
-            $ ./configure --enable-production          #optimized code
-            $ ./configure --enable-production=profile  #for use with gprof
+            $ ./configure --enable-build-mode=debug       #symbolic debugging
+            $ ./configure --enable-build-mode=production  #optimized code
+            $ ./configure --enable-production=profile     #for use with gprof
 
         Regardless of whether support for symbolic debugging is enabled,
         the library can also perform runtime debugging of certain packages 
         (such as type conversion execution times and extensive invariant 
-        condition checking). To enable this debugging, supply a
-        comma-separated list of package names to to the `--enable-debug'
-        switch.  See "Debugging HDF5 Applications" for a list of package 
-        names:
+        condition checking). To enable this debugging, supply a 
+        comma-separated list of package names to the `--enable-internal-debug' 
+        switch.  See "Debugging HDF5 Applications" for a list of package names:
 
             http://www.hdfgroup.org/HDF5/doc/H5.user/Debugging.html
 
-        Debugging can be disabled by saying `--disable-debug'. 
+        Debugging can be disabled by saying `--disable-internal-debug'. 
         The default debugging level for snapshots is a subset of the
         available packages; the default for supported releases is no
         debugging (debugging can incur a significant runtime penalty).
 
-            $ ./configure --enable-debug=s,t  #debug only H5S and H5T
-            $ ./configure --enable-debug      #debug normal packages
-            $ ./configure --enable-debug=all  #debug all packages
-            $ ./configure --disable-debug     #no debugging
+            $ ./configure --enable-internal-debug=s,t  #debug only H5S and H5T
+            $ ./configure --enable-internal-debug      #debug normal packages
+            $ ./configure --enable-internal-debug=all  #debug all packages
+            $ ./configure --disable-internal-debug     #no debugging
 
         HDF5 can also print a trace of all API function calls, their 
         arguments, and the return values. To enable or disable the
@@ -466,15 +466,17 @@ CONTENTS
             http://www.hdfgroup.org/HDF5/doc/TechNotes/ThreadSafeLibrary.html
 
 4.3.12. Backward compatibility
-        The 1.8 version of the HDF5 Library can be configured to operate
-        identically to the v1.6 library with the 
+        The 1.10 version of the HDF5 Library can be configured to operate
+        identically to the v1.8 library with the 
+            --with-default-api-version=v18
+        configure flag, or identically to the v1.6 library with the 
             --with-default-api-version=v16
         configure flag. This allows existing code to be compiled with the
-        v1.8 library without requiring immediate changes to the application 
+        v1.10 library without requiring immediate changes to the application 
         source code.  For addtional configuration options and other details, 
         see "API Compatibility Macros in HDF5":
 
-            http://www.hdfgroup.org/HDF5/doc/RM/APICompatMacros.html 
+            https://support.hdfgroup.org/HDF5/doc/RM/APICompatMacros.html 
 
 4.4. Building
         The library, confidence tests, and programs can be built by
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 87d7886..1861d92 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -648,7 +648,7 @@ adding an option (${CTEST_SCRIPT_ARG}) to the platform configuration script.
 ### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201764 -C Release -VV -O hdf5.log         ###
 #############################################################################################
 
-cmake_minimum_required (VERSION 3.3.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)
 ############################################################################
 # Usage:
 #     ctest -S HDF5config.cmake,OPTION=VALUE -C Release -VV -O test.log
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index c62e8d9..da46821 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -56,6 +56,26 @@ New Features
     -------------
     - CMake
 
+      Change minimum version to 3.10.
+
+      This change removes the need to support a copy of the FindMPI.cmake module,
+      which has been removed, along with its subfolder in the config/cmake_ext_mod
+      location.
+
+      (ADB - 2018/03/09)
+
+    - CMake
+
+      Add pkg-config file generation
+
+      Added pkg-config file generation for the C, C++, HL, and HL C++ libraries.
+      In addition, builds on linux will create h5cXXX scripts that use the pkg-config
+      files. This is a limited implementation of a script like autotools h5cc.
+
+      (ADB - 2018/03/08, HDFFV-4359)
+
+    - CMake
+
       Refactor use of CMAKE_BUILD_TYPE for new variable, which understands
       the type of generator in use.
 
@@ -204,7 +224,63 @@ New Features
 
     C++ Library:
     ------------
-    -
+    - The following wrappers are added:
+
+      + H5Lcreate_soft:
+        // Creates a soft link from link_name to target_name.
+        void link(const char *target_name, const char *link_name,...)
+        void link(const H5std_string& target_name,...)
+
+      + H5Lcreate_hard:
+        // Creates a hard link from new_name to curr_name.
+        void link(const char *curr_name, const Group& new_loc,...)
+        void link(const H5std_string& curr_name, const Group& new_loc,...)
+
+        // Creates a hard link from new_name to curr_name in same location.
+        void link(const char *curr_name, const hid_t same_loc,...)
+        void link(const H5std_string& curr_name, const hid_t same_loc,...)
+
+        Note: previous version of H5Location::link will be deprecated.
+
+      + H5Lcopy:
+        // Copy an object from a group of file to another.
+        void copyLink(const char *src_name, const Group& dst,...)
+        void copyLink(const H5std_string& src_name, const Group& dst,...)
+
+        // Copy an object from a group of file to the same location.
+        void copyLink(const char *src_name, const char *dst_name,...)
+        void copyLink(const H5std_string& src_name,...)
+
+      + H5Lmove:
+        // Rename an object in a group or file to a new location.
+        void moveLink(const char* src_name, const Group& dst,...)
+        void moveLink(const H5std_string& src_name, const Group& dst,...)
+
+        // Rename an object in a group or file to the same location.
+        void moveLink(const char* src_name, const char* dst_name,...)
+        void moveLink(const H5std_string& src_name,...)
+
+        Note: previous version H5Location::move will be deprecated.
+
+      + H5Ldelete:
+        // Removes the specified link from this location.
+        void unlink(const char *link_name,
+            const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
+        void unlink(const H5std_string& link_name,
+            const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
+
+    - Added class LinkCreatPropList
+
+    - Added overloaded functions H5Location::createGroup to take a link
+      creation property list
+        Group createGroup(const char* name, const LinkCreatPropList& lcpl)
+        Group createGroup(const H5std_string& name, const LinkCreatPropList& lcpl)
+    - Added wrapper for H5Lget_info() to H5Location
+        // Returns the information of the named link.
+        H5L_info_t getLinkInfo(const H5std_string& link_name,...)
+
+      (BMR - 2018/03/11, HDFFV-10149)
+
 
     Java Library:
     ----------------
@@ -298,6 +374,18 @@ Bug Fixes since HDF5-1.10.1 release
 
       (VC - 2017/11/28, HDFFV-9947)
 
+    - H5Pset_evict_on_close in H5Pfapl.c
+
+      Changed the minor error number from H5E_CANTSET to H5E_UNSUPPORTED for
+      parallel library.
+             (ADB - 2018/03/6, HDFFV-10414)
+
+    - Utility function can not handle lowercase Windows drive letters
+
+      Added call to toupper function for drive letter.
+
+      (ADB - 2017/12/18, HDFFV-10307)
+
     - filter plugin handling in H5PL.c and H5Z.c
 
       It was discovered that the dynamic loading process used by
@@ -409,6 +497,63 @@ Bug Fixes since HDF5-1.10.1 release
 
       (RAW - 2017/12/01, HDFFV-10272)
 
+    - If an HDF5 file contains a filter pipeline message with a 'number of
+      filters' field that exceeds the maximum number of allowed filters,
+      the error handling code will attempt to dereference a NULL pointer.
+
+      This issue was reported to The HDF Group as issue #CVE-2017-17505.
+
+      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.
+
+      This problem arose because the error handling code assumed that
+      the 'number of filters' field implied that a dynamic array of that
+      size had already been created and that the cleanup code should
+      iterate over that array and clean up each element's resources. If
+      an error occurred before the array has been allocated, this will
+      not be true.
+
+      This has been changed so that the number of filters is set to
+      zero on errors. Additionally, the filter array traversal in the
+      error handling code now requires that the filter array not be NULL.
+
+      (DER - 2018/02/06, HDFFV-10354)
+
+    - If an HDF5 file contains a filter pipeline message which contains
+      a 'number of filters' field that exceeds the actual number of
+      filters in the message, the HDF5 C library will read off the end of
+      the read buffer.
+
+      This issue was reported to The HDF Group as issue #CVE-2017-17506.
+
+      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 problem was fixed by passing the buffer size with the buffer
+      and ensuring that the pointer cannot be incremented off the end
+      of the buffer. A mismatch between the number of filters declared
+      and the actual number of filters will now invoke normal HDF5
+      error handling.
+
+      (DER - 2018/02/26, HDFFV-10355)
+
+    - If an HDF5 file contains a malformed compound type which contains
+      a member of size zero, a division by zero error will occur while
+      processing the type.
+
+      This issue was reported to The HDF Group as issue #CVE-2017-17508.
+
+      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.
+
+      Checking for zero before dividing fixes the problem. Instead of the
+      division by zero, the normal HDF5 error handling is invoked.
+
+      (DER - 2018/02/26, HDFFV-10357)
+
     Configuration
     -------------
     - CMake
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index 8dd47c2..b516056 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -180,7 +180,7 @@ Given the preconditions in section I, create a CMakeLists.txt file at the
 source root. Include the following text in the file:
 
 ##########################################################
-cmake_minimum_required (VERSION 3.10.1)
+cmake_minimum_required (VERSION 3.10)
 project (HDF5MyApp C CXX)
 
 set (LIB_TYPE STATIC) # or SHARED
@@ -229,7 +229,7 @@ your application with an installed HDF5 binary.
 ctest use of HDF5_Examples.cmake and HDF5_Examples_options.cmake
 ========================================================================
 
-cmake_minimum_required (VERSION 3.3.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)
 ###############################################################################################################
 # This script will build and run the examples from a folder
 # Execute from a command line: