diff --git a/CVE-2021-31348.patch b/CVE-2021-31348.patch deleted file mode 100644 index b27f9719d79c2690250511b0c3613018c23c8048..0000000000000000000000000000000000000000 --- a/CVE-2021-31348.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naru "netcdf-c-4.7.3 copy/libdap4/ezxml.c" netcdf-c-4.7.3/libdap4/ezxml.c ---- "netcdf-c-4.7.3 copy/libdap4/ezxml.c" 2022-07-13 10:24:32.128424000 +0800 -+++ netcdf-c-4.7.3/libdap4/ezxml.c 2022-07-13 10:24:57.220170000 +0800 -@@ -574,7 +574,7 @@ - for (l = 0; *s && ((! l && *s != '>') || (l && (*s != ']' || - *(s + strspn(s + 1, EZXML_WS) + 1) != '>'))); - l = (*s == '[') ? 1 : l) s += strcspn(s + 1, "[]>") + 1; -- if (! *s && e != '>') -+ if (! *s) - return ezxml_err(root, d, "unclosed xml; diff --git a/netcdf-4.7.3.tar.gz b/netcdf-4.8.1.tar.gz similarity index 66% rename from netcdf-4.7.3.tar.gz rename to netcdf-4.8.1.tar.gz index 88e093fd710afb995ffd0ac6a0fe71869c57fde1..2480124f6854795d4941d300d98d82476e0a1a0d 100644 Binary files a/netcdf-4.7.3.tar.gz and b/netcdf-4.8.1.tar.gz differ diff --git a/netcdf.spec b/netcdf.spec index 57455801ae08cce9ca78c22e2864339c47c99eb6..2331665ed4da2727f2d92f1b510fb43c8a018e3b 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,12 +1,12 @@ +%global sover 19 Name: netcdf -Version: 4.7.3 -Release: 2 +Version: 4.8.1 +Release: 1 Summary: Libraries for the Unidata network Common Data Form -License: NetCDF +License: BSD-3-Clause URL: https://github.com/Unidata/netcdf-c Source0: https://github.com/Unidata/netcdf-c/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0000: CVE-2021-31348.patch BuildRequires: make BuildRequires: environment-modules @@ -212,7 +212,9 @@ make %{?_smp_mflags} -C build check %{_bindir}/ncdump %{_bindir}/ncgen %{_bindir}/ncgen3 -%{_libdir}/*.so.15* +%{_bindir}/nc4print +%{_bindir}/ocprint +%{_libdir}/*.so.%{sover}* %{_mandir}/man1/* %files devel @@ -224,6 +226,15 @@ make %{?_smp_mflags} -C build check %{_includedir}/netcdf_filter.h %{_includedir}/netcdf_meta.h %{_includedir}/netcdf_mem.h +%ifarch x86_64 +%{_includedir}/mpich-x86_64/netcdf_filter_build.h +%{_includedir}/openmpi-x86_64/netcdf_filter_build.h +%endif +%ifarch aarch64 +%{_includedir}/mpich-aarch64/netcdf_filter_build.h +%{_includedir}/openmpi-aarch64/netcdf_filter_build.h +%endif +%{_includedir}/netcdf_filter_build.h %{_libdir}/libnetcdf.settings %{_libdir}/*.so %{_libdir}/pkgconfig/netcdf.pc @@ -240,7 +251,9 @@ make %{?_smp_mflags} -C build check %{_libdir}/mpich/bin/ncdump %{_libdir}/mpich/bin/ncgen %{_libdir}/mpich/bin/ncgen3 -%{_libdir}/mpich/lib/*.so.15* +%{_libdir}/mpich/bin/nc4print +%{_libdir}/mpich/bin/ocprint +%{_libdir}/mpich/lib/*.so.%{sover}* %doc %{_libdir}/mpich/share/man/man1/*.1* %files mpich-devel @@ -269,7 +282,9 @@ make %{?_smp_mflags} -C build check %{_libdir}/openmpi/bin/ncdump %{_libdir}/openmpi/bin/ncgen %{_libdir}/openmpi/bin/ncgen3 -%{_libdir}/openmpi/lib/*.so.15* +%{_libdir}/openmpi/bin/nc4print +%{_libdir}/openmpi/bin/ocprint +%{_libdir}/openmpi/lib/*.so.%{sover}* %doc %{_libdir}/openmpi/share/man/man1/*.1* %files openmpi-devel @@ -291,6 +306,9 @@ make %{?_smp_mflags} -C build check %endif %changelog +* Wed Oct 26 2022 liyanan - 4.8.1-1 +- Upgrade to 4.8.1 + * Wed Jul 13 2022 dengyuyu - 4.7.3-2 - fix CVE-2021-31348