diff --git a/_service b/_service
index 487f1b5..cfcfbf4 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
.git
libvma
@PARENT_TAG@.@TAG_OFFSET@.%h
- 47396f1a5eaa98e589be0684c921c885e88d2ac3
+ 789c380f9b82727faa6cb5ea3b4b06bacbd466b4
libvma*.tar
diff --git a/issue-2485156-Fix-fc35-issues.patch b/issue-2485156-Fix-fc35-issues.patch
deleted file mode 100644
index e39fec8..0000000
--- a/issue-2485156-Fix-fc35-issues.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit e4660f93007e41c7dbfdb5e3e166c3a9e84a5ae6
-Author: Igor Ivanov
-Date: Thu Jun 17 16:07:31 2021 +0300
-
- issue: 2485156 Fix fc35 issues
-
- - glibc:
- The function pthread_yield has been deprecated; programs should use
- the equivalent standard function sched_yield instead.
-
- Signed-off-by: Igor Ivanov
-
-diff --git src/vma/iomux/epfd_info.cpp src/vma/iomux/epfd_info.cpp
-index c7670c7b36b4..d7c6c4fcdf9e 100644
---- src/vma/iomux/epfd_info.cpp
-+++ src/vma/iomux/epfd_info.cpp
-@@ -624,7 +624,7 @@ int epfd_info::ring_poll_and_process_element(uint64_t *p_poll_sn, void* pv_fd_re
-
- m_ring_map_lock.unlock();
-
-- if (m_sysvar_thread_mode == THREAD_MODE_PLENTY && ret_total == 0 && errno == EAGAIN) pthread_yield();
-+ if (m_sysvar_thread_mode == THREAD_MODE_PLENTY && ret_total == 0 && errno == EAGAIN) sched_yield();
-
- if (ret_total) {
- __log_func("ret_total=%d", ret_total);
diff --git a/issue-2945718-Fix-gcc12-compilation-issue.patch b/issue-2945718-Fix-gcc12-compilation-issue.patch
deleted file mode 100644
index 4af0edf..0000000
--- a/issue-2945718-Fix-gcc12-compilation-issue.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 865def12ac0e46a80c2ace2e7ed39258b3de30ed
-Author: Igor Ivanov
-Date: Mon Jan 31 20:01:33 2022 +0200
-
- issue: 2945718 Fix gcc12 compilation issue
-
- C++17 has deprecated a few components that had been in C++ since its beginning,
- and std::iterator is one of them.
-
- In addition fixed configure warning:
- checking mellanox/dpcp.h presence... no
- configure: WARNING: mellanox/dpcp.h: accepted by the compiler, rejected by the preprocessor!
- configure: WARNING: mellanox/dpcp.h: proceeding with the compiler's result
- The reason: preprocessor does not see -std=c++11
-
- Signed-off-by: Igor Ivanov
-
-diff --git config/m4/dpcp.m4 config/m4/dpcp.m4
-index 3d3a7593190e..31b40ce6ef78 100644
---- config/m4/dpcp.m4
-+++ config/m4/dpcp.m4
-@@ -43,7 +43,7 @@ AS_IF([test "x$with_dpcp" == xno],
- vma_cv_dpcp_LDFLAGS="-L$with_dpcp/lib64 -Wl,--rpath,$with_dpcp/lib64"
- fi
-
-- CPPFLAGS="$vma_cv_dpcp_CPPFLAGS $CPPFLAGS"
-+ CPPFLAGS="-std=c++11 $vma_cv_dpcp_CPPFLAGS $CPPFLAGS"
- CXXFLAGS="-std=c++11 $CXXFLAGS"
- LDFLAGS="$vma_cv_dpcp_LDFLAGS $LDFLAGS"
- LIBS="$vma_cv_dpcp_LIBS $LIBS"
-diff --git src/vma/util/vma_list.h src/vma/util/vma_list.h
-index ae57fba43676..9c9b6b38b1d5 100644
---- src/vma/util/vma_list.h
-+++ src/vma/util/vma_list.h
-@@ -88,9 +88,14 @@ public :
-
- template
- /* coverity[missing_move_assignment] */
--class list_iterator_t : public std::iterator
-+class list_iterator_t
- {
- public:
-+ using iterator_category = std::random_access_iterator_tag;
-+ using value_type = T;
-+ using difference_type = std::ptrdiff_t;
-+ using pointer = T*;
-+ using reference = T&;
-
- list_iterator_t(T* ptr = NULL) : m_ptr(ptr) {}
-
diff --git a/libvma-9.3.1.0.47396f1a5eaa.tar.gz b/libvma-9.3.1.0.47396f1a5eaa.tar.gz
deleted file mode 100644
index a86000e..0000000
--- a/libvma-9.3.1.0.47396f1a5eaa.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe00c2d37302251f6b9f83a5aa061aa9299502563e93a4959efc359d99dbf154
-size 1113612
diff --git a/libvma-9.7.0.0.789c380f9b82.tar.gz b/libvma-9.7.0.0.789c380f9b82.tar.gz
new file mode 100644
index 0000000..847bbf9
--- /dev/null
+++ b/libvma-9.7.0.0.789c380f9b82.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b04415899e50e9ada8f455e2250bc36500918df0004fe018efe48a8171fc956
+size 1130293
diff --git a/libvma.changes b/libvma.changes
index 0b94393..7879f42 100644
--- a/libvma.changes
+++ b/libvma.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Fri Sep 30 13:13:43 UTC 2022 - Nicolas Morey-Chaisemartin
+
+- Update to v9.7.0 (jsc#PED-913)
+ - Fixing the handling of null elements in iov tx vector
+ - Updating coverity version to 2021.12
+ - Fixing coverity 2021.12 findings
+ - Fixing pcb resources leak for failed blocking connect
+ - Fix no SYN rexmits for blocking connect
+ - Fix blocking socket connect timer race
+ - Use VMA_HANDLE_SIGINTR for signal() API
+ - Fix segfault when IPoIB is used along with extra logging
+ - Fix no traffic during disabled sriov (azure)
+ - Update Copyright
+ - Fix stats output logic
+ - Fix debian/copyright file
+ - Fix hypervisor check under x86_64
+ - Fix gcc12 compilation issue
+ - Fix VMA_UDP_3T_RULES logic for UDP UC
+ - Add C++11 Support requirement to a compiler
+ - Export symbols from socket api only
+ - Fix gcc12 compilation issue
+ - Fix fc35 issues
+ - Add support for fortified glibc functions
+ - Fix issue in vma_recvfrom_zcopy()
+ - Fix data corruption in shrink operation
+ - Workaround for segfault on IBV_EVENT_DEVICE_FATAL
+- Drop patches fixed upstream:
+ - issue-2485156-Fix-fc35-issues.patch
+ - issue-2945718-Fix-gcc12-compilation-issue.patch
+
-------------------------------------------------------------------
Mon Jun 13 06:47:26 UTC 2022 - Nicolas Morey-Chaisemartin
diff --git a/libvma.spec b/libvma.spec
index 3b3107d..223b250 100644
--- a/libvma.spec
+++ b/libvma.spec
@@ -17,19 +17,17 @@
#
-%define git_ver .0.47396f1a5eaa
+%define git_ver .0.789c380f9b82
%define lib_major 9
Name: libvma
Summary: A library for boosting TCP and UDP traffic (over RDMA hardware)
License: BSD-2-Clause OR GPL-2.0-only
Group: Development/Libraries/C and C++
-Version: 9.3.1
+Version: 9.7.0
Release: 0
Source0: %{name}-%{version}%{git_ver}.tar.gz
Source1: vma.service
-Patch1: issue-2485156-Fix-fc35-issues.patch
-Patch2: issue-2945718-Fix-gcc12-compilation-issue.patch
Patch3: harden_vma.service.patch
URL: https://github.com/Mellanox/libvma
BuildRequires: autoconf
@@ -73,8 +71,6 @@ Headers and symbolink link required to compile and link with the Libvma library.
%prep
%setup -q -n %{name}-%{version}%{git_ver}
-%patch1
-%patch2
%patch3 -p1
%build
@@ -128,7 +124,7 @@ for service in vma; do ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc${se
%{_bindir}/vma_stats
%{_datadir}/%{name}/vma_perf_envelope.sh
%{_mandir}/man*/*
-%license COPYING
+%license LICENSE
%files -n libvma%{lib_major}
%{_libdir}/%{name}*.so.*