Skip to content

Commit 08a425f

Browse files
[AUTO-CHERRYPICK] Upgrade hdf5 to 1.14.4. to under several CVEs. - branch main (#9182)
Co-authored-by: George Mileka <gmileka@users.noreply.github.com>
1 parent c5f4ef7 commit 08a425f

11 files changed

Lines changed: 183 additions & 346 deletions

File tree

SPECS-EXTENDED/gdal/gdal.spec

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Summary: GIS file format library
1515
#global pre rc1
1616
Name: gdal
1717
Version: 3.6.3
18-
Release: 2%{?dist}
18+
Release: 3%{?dist}
1919
License: MIT
2020
Vendor: Microsoft Corporation
2121
Distribution: Mariner
@@ -41,7 +41,7 @@ BuildRequires: geos-devel
4141
BuildRequires: giflib-devel
4242
BuildRequires: gtest-devel
4343
BuildRequires: hdf-devel
44-
BuildRequires: hdf5-devel
44+
BuildRequires: hdf5-devel >= 1.14.4
4545
BuildRequires: json-c-devel
4646
BuildRequires: libdap-devel
4747
BuildRequires: libgeotiff-devel
@@ -97,6 +97,7 @@ BuildRequires: java-devel >= 1:1.6.0
9797
BuildRequires: javapackages-local
9898
BuildRequires: jpackage-utils
9999
%endif
100+
Requires: hdf5 >= 1.14.4
100101

101102
%description
102103
Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform
@@ -315,6 +316,10 @@ ctest -E "autotest_osr|autotest_alg|autotest_gdrivers|autotest_gcore"
315316

316317

317318
%changelog
319+
- Bumping the release version so that this package is re-built with the newer
320+
1.14.4 hdf5 libraries. This ensures that the matching 1.14.4 .so files Will
321+
be used at run time.
322+
318323
* Thu Aug 17 2023 Archana Choudhary <archana1@microsoft.com> - 3.6.3-2
319324
- Initial CBL-Mariner import from Fedora 38 (license: MIT).
320325
- License verified.

SPECS-EXTENDED/netcdf/netcdf.spec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Summary: Libraries for the Unidata network Common Data Form
1313
Name: netcdf
1414
Version: 4.9.0
15-
Release: 4%{?dist}
15+
Release: 5%{?dist}
1616
License: NetCDF
1717
Vendor: Microsoft Corporation
1818
Distribution: Mariner
@@ -27,7 +27,7 @@ BuildRequires: curl-devel
2727
BuildRequires: doxygen
2828
BuildRequires: gawk
2929
BuildRequires: hdf-static
30-
BuildRequires: hdf5-devel
30+
BuildRequires: hdf5-devel = %{_hdf5_version}
3131
BuildRequires: libtool
3232
BuildRequires: libxml2-devel
3333
BuildRequires: libzstd-devel
@@ -77,7 +77,7 @@ NetCDF data is:
7777
Summary: Development files for netcdf
7878
Requires: %{name}%{?_isa} = %{version}-%{release}
7979
Requires: curl-devel%{?_isa}
80-
Requires: hdf5-devel%{?_isa}
80+
Requires: hdf5-devel%{?_isa} >= 1.14.4
8181
Requires: pkgconfig%{?_isa}
8282

8383
%description devel
@@ -398,6 +398,10 @@ done
398398

399399

400400
%changelog
401+
- Bumping the release version so that this package is re-built with the newer
402+
1.14.4 hdf5 libraries. This ensures that the matching 1.14.4 .so files Will
403+
be used at run time.
404+
401405
* Thu Aug 10 2023 Archana Choudhary <archana1@microsoft.com> - 4.9.0-4
402406
- Initial CBL-Mariner import from Fedora 37 (license: MIT).
403407
- License verified.

SPECS/hdf5/CVE-2021-37501.patch

Lines changed: 0 additions & 134 deletions
This file was deleted.

SPECS/hdf5/hdf5-LD_LIBRARY_PATH.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)