[packages/hdf5] - updated to 1.10.10; gif2h5/h52gif removed (deprecated and disabled by default, have known CVEs)
qboosh
qboosh at pld-linux.org
Mon Aug 21 18:06:55 CEST 2023
commit 6f201a709a901bbe34a92ed8d04bd26a94b54da8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Aug 21 17:37:20 2023 +0200
- updated to 1.10.10; gif2h5/h52gif removed (deprecated and disabled by default, have known CVEs)
hdf5-cmake.patch | 42 +++++++++---------------------------------
hdf5-sh.patch | 34 +++++++++++++++++-----------------
hdf5.spec | 10 ++++------
3 files changed, 30 insertions(+), 56 deletions(-)
---
diff --git a/hdf5.spec b/hdf5.spec
index 6ac7cad..78f586b 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -12,12 +12,12 @@
Summary: Hierarchical Data Format 5 library
Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5)
Name: hdf5
-Version: 1.10.9
-Release: 3
+Version: 1.10.10
+Release: 1
License: Nearly BSD, but changed sources must be marked
Group: Libraries
Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 8f9eac14d3ee4719c3e4b52863ea42e9
+# Source0-md5: ea3078eca38884da6bb6d61575c236b3
Patch0: %{name}-sig.patch
Patch1: %{name}-cmake.patch
Patch2: %{name}-sh.patch
@@ -511,8 +511,6 @@ rm -rf $RPM_BUILD_ROOT
%files progs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gif2h5
-%attr(755,root,root) %{_bindir}/h52gif
%attr(755,root,root) %{_bindir}/h5clear
%attr(755,root,root) %{_bindir}/h5copy
%attr(755,root,root) %{_bindir}/h5debug
@@ -534,7 +532,7 @@ rm -rf $RPM_BUILD_ROOT
%if %{with java}
%files -n java-hdf5
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libhdf5_java.so.100.7.0
+%attr(755,root,root) %{_libdir}/libhdf5_java.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libhdf5_java.so.100
%attr(755,root,root) %{_libdir}/libhdf5_java.so
%{_javadir}/jarhdf5-%{version}.jar
diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index ff0a289..d0ee001 100644
--- a/hdf5-cmake.patch
+++ b/hdf5-cmake.patch
@@ -36,7 +36,7 @@
-endforeach ()
--- hdf5-1.8.20/config/cmake/hdf5-targets.cmake.in.orig 1970-01-01 01:00:00.000000000 +0100
+++ hdf5-1.8.20/config/cmake/hdf5-targets.cmake.in 2018-05-09 18:50:11.684497207 +0200
-@@ -0,0 +1,218 @@
+@@ -0,0 +1,212 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
@@ -55,7 +55,7 @@
+set(_targetsDefined)
+set(_targetsNotDefined)
+set(_expectedTargets)
-+foreach(_expectedTarget hdf5::hdf5-static hdf5::hdf5-shared hdf5::hdf5_tools-static hdf5::hdf5_tools-shared hdf5::h5diff hdf5::h5diff-shared hdf5::h5ls hdf5::h5ls-shared hdf5::h5debug hdf5::h5repart hdf5::h5mkgrp hdf5::h5import hdf5::h5repack hdf5::h5repack-shared hdf5::h5jam hdf5::h5unjam hdf5::h5copy hdf5::h5copy-shared hdf5::h5stat hdf5::h5stat-shared hdf5::h5dump hdf5::h5dump-shared hdf5::hdf5_hl-static hdf5::hdf5_hl-shared hdf5::gif2h5 hdf5::h52gif hdf5::hdf5_cpp-static hdf5::hdf5_cpp-shared hdf5::hdf5_hl_cpp-static hdf5::hdf5_hl_cpp-shared)
++foreach(_expectedTarget hdf5::hdf5-static hdf5::hdf5-shared hdf5::hdf5_tools-static hdf5::hdf5_tools-shared hdf5::h5diff hdf5::h5diff-shared hdf5::h5ls hdf5::h5ls-shared hdf5::h5debug hdf5::h5repart hdf5::h5mkgrp hdf5::h5import hdf5::h5repack hdf5::h5repack-shared hdf5::h5jam hdf5::h5unjam hdf5::h5copy hdf5::h5copy-shared hdf5::h5stat hdf5::h5stat-shared hdf5::h5dump hdf5::h5dump-shared hdf5::hdf5_hl-static hdf5::hdf5_hl-shared hdf5::hdf5_cpp-static hdf5::hdf5_cpp-shared hdf5::hdf5_hl_cpp-static hdf5::hdf5_hl_cpp-shared)
+ list(APPEND _expectedTargets ${_expectedTarget})
+ if(NOT TARGET ${_expectedTarget})
+ list(APPEND _targetsNotDefined ${_expectedTarget})
@@ -194,12 +194,6 @@
+ INTERFACE_LINK_LIBRARIES "hdf5::hdf5-shared"
+)
+
-+# Create imported target hdf5::gif2h5
-+add_executable(hdf5::gif2h5 IMPORTED)
-+
-+# Create imported target hdf5::h52gif
-+add_executable(hdf5::h52gif IMPORTED)
-+
+# Create imported target hdf5::hdf5_cpp-static
+add_library(hdf5::hdf5_cpp-static STATIC IMPORTED)
+
@@ -257,7 +251,7 @@
+cmake_policy(POP)
--- hdf5-1.8.20/config/cmake/hdf5-targets-noconfig.cmake.in.orig 1970-01-01 01:00:00.000000000 +0100
+++ hdf5-1.8.20/config/cmake/hdf5-targets-noconfig.cmake.in 2018-05-09 18:54:57.997827272 +0200
-@@ -0,0 +1,289 @@
+@@ -0,0 +1,271 @@
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
@@ -278,7 +272,7 @@
+# Import target "hdf5::hdf5-shared" for configuration ""
+set_property(TARGET hdf5::hdf5-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+set_target_properties(hdf5::hdf5-shared PROPERTIES
-+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.3.2"
++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.4.0"
+ IMPORTED_SONAME_NOCONFIG "libhdf5.so.103"
+ )
+
@@ -298,12 +292,12 @@
+# Import target "hdf5::hdf5_tools-shared" for configuration ""
+set_property(TARGET hdf5::hdf5_tools-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+set_target_properties(hdf5::hdf5_tools-shared PROPERTIES
-+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.103.3.0"
++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.103.4.0"
+ IMPORTED_SONAME_NOCONFIG "libhdf5_tools.so.103"
+ )
+
+list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_tools-shared )
-+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.103.3.0" )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.103.4.0" )
+
+# Import target "hdf5::h5diff" for configuration ""
+set_property(TARGET hdf5::h5diff APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
@@ -481,30 +475,12 @@
+set_property(TARGET hdf5::hdf5_hl-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+set_target_properties(hdf5::hdf5_hl-shared PROPERTIES
+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.100"
-+ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.6"
++ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.7"
+ )
+
+list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_hl-shared )
+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl-shared "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.100" )
+
-+# Import target "hdf5::gif2h5" for configuration ""
-+set_property(TARGET hdf5::gif2h5 APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-+set_target_properties(hdf5::gif2h5 PROPERTIES
-+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/gif2h5"
-+ )
-+
-+list(APPEND _IMPORT_CHECK_TARGETS hdf5::gif2h5 )
-+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::gif2h5 "${_IMPORT_PREFIX}/bin/gif2h5" )
-+
-+# Import target "hdf5::h52gif" for configuration ""
-+set_property(TARGET hdf5::h52gif APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-+set_target_properties(hdf5::h52gif PROPERTIES
-+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h52gif"
-+ )
-+
-+list(APPEND _IMPORT_CHECK_TARGETS hdf5::h52gif )
-+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h52gif "${_IMPORT_PREFIX}/bin/h52gif" )
-+
+# Import target "hdf5::hdf5_cpp-static" for configuration ""
+set_property(TARGET hdf5::hdf5_cpp-static APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+set_target_properties(hdf5::hdf5_cpp-static PROPERTIES
@@ -518,7 +494,7 @@
+# Import target "hdf5::hdf5_cpp-shared" for configuration ""
+set_property(TARGET hdf5::hdf5_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+set_target_properties(hdf5::hdf5_cpp-shared PROPERTIES
-+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.4.1"
++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.4.2"
+ IMPORTED_SONAME_NOCONFIG "libhdf5_cpp.so.103"
+ )
+
@@ -538,7 +514,7 @@
+# Import target "hdf5::hdf5_hl_cpp-shared" for configuration ""
+set_property(TARGET hdf5::hdf5_hl_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+set_target_properties(hdf5::hdf5_hl_cpp-shared PROPERTIES
-+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.7"
++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.8"
+ IMPORTED_SONAME_NOCONFIG "libhdf5_hl_cpp.so.100"
+ )
+
diff --git a/hdf5-sh.patch b/hdf5-sh.patch
index 44c5edd..45cc129 100644
--- a/hdf5-sh.patch
+++ b/hdf5-sh.patch
@@ -1,47 +1,47 @@
---- hdf5-1.10.5/m4/aclocal_cxx.m4.orig 2018-09-04 04:54:44.000000000 +0200
-+++ hdf5-1.10.5/m4/aclocal_cxx.m4 2019-04-02 21:29:26.123178128 +0200
-@@ -26,7 +26,7 @@
+--- hdf5-1.10.10/m4/aclocal_cxx.m4.orig 2023-08-21 06:23:45.185096953 +0200
++++ hdf5-1.10.10/m4/aclocal_cxx.m4 2023-08-21 06:24:56.672450942 +0200
+@@ -26,7 +26,7 @@ dnl have a [PAC] prefix.
dnl Checking if C++ needs old style header files in includes
AC_DEFUN([PAC_PROG_CXX_HEADERS],[
AC_MSG_CHECKING([if $CXX needs old style header files in includes])
-- TEST_SRC="`(echo \"#define OLD_HEADER_FILENAME 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`"
-+ TEST_SRC="$(echo "#define OLD_HEADER_FILENAME 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)"
+- TEST_SRC="`(echo \"#define OLD_HEADER_FILENAME 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`"
++ TEST_SRC="$(echo "#define OLD_HEADER_FILENAME 1"; cat $srcdir/config/cmake/HDFCXXTests.cpp)"
AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])],
[AC_MSG_RESULT([no])],
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ AC_DEFUN([PAC_PROG_CXX_HEADERS],[
dnl Checking if ++ can handle namespaces
AC_DEFUN([PAC_PROG_CXX_NAMESPACE],[
AC_MSG_CHECKING([if $CXX can handle namespaces])
-- TEST_SRC="`(echo \"#define HDF_NO_NAMESPACE 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`"
-+ TEST_SRC="$(echo "#define HDF_NO_NAMESPACE 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)"
+- TEST_SRC="`(echo \"#define HDF_NO_NAMESPACE 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`"
++ TEST_SRC="$(echo "#define HDF_NO_NAMESPACE 1"; cat $srcdir/config/cmake/HDFCXXTests.cpp)"
AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,7 @@ AC_DEFUN([PAC_PROG_CXX_NAMESPACE],[
dnl Checking if C++ supports std
AC_DEFUN([PAC_PROG_CXX_STD],[
AC_MSG_CHECKING([if $CXX supports std])
-- TEST_SRC="`(echo \"#define HDF_NO_STD 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`"
-+ TEST_SRC="$(echo "#define HDF_NO_STD 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)"
+- TEST_SRC="`(echo \"#define HDF_NO_STD 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`"
++ TEST_SRC="$(echo "#define HDF_NO_STD 1"; cat $srcdir/config/cmake/HDFCXXTests.cpp)"
AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,7 @@ AC_DEFUN([PAC_PROG_CXX_STD],[
dnl Checking if C++ has offsetof extension
AC_DEFUN([PAC_PROG_CXX_OFFSETOF],[
AC_MSG_CHECKING([if $CXX has offsetof extension])
-- TEST_SRC="`(echo \"#define CXX_HAVE_OFFSETOF 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`"
-+ TEST_SRC="$(echo "#define CXX_HAVE_OFFSETOF 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)"
+- TEST_SRC="`(echo \"#define CXX_HAVE_OFFSETOF 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`"
++ TEST_SRC="$(echo "#define CXX_HAVE_OFFSETOF 1"; cat $srcdir/config/cmake/HDFCXXTests.cpp)"
AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])],[AC_MSG_RESULT([yes])
AC_DEFINE([CXX_HAVE_OFFSETOF], [1], [Define if C++ compiler recognizes offsetof])],
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ AC_DEFUN([PAC_PROG_CXX_OFFSETOF],[
dnl Checking if C++ can handle static cast
AC_DEFUN([PAC_PROG_CXX_STATIC_CAST],[
AC_MSG_CHECKING([if $CXX can handle static cast])
-- TEST_SRC="`(echo \"#define NO_STATIC_CAST 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`"
-+ TEST_SRC="$(echo "#define NO_STATIC_CAST 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)"
+- TEST_SRC="`(echo \"#define NO_STATIC_CAST 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`"
++ TEST_SRC="$(echo "#define NO_STATIC_CAST 1"; cat $srcdir/config/cmake/HDFCXXTests.cpp)"
AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf5.git/commitdiff/6f201a709a901bbe34a92ed8d04bd26a94b54da8
More information about the pld-cvs-commit
mailing list