[librdmacm] Update to latest upstream git version
Doug Ledford
dledford at fedoraproject.org
Thu Dec 6 19:00:57 UTC 2012
commit 3922e6ad34cbf83e6e66f5d9fd41235a274d1963
Author: Doug Ledford <dledford at redhat.com>
Date: Thu Dec 6 14:00:07 2012 -0500
Update to latest upstream git version
Resolves CVE-2012-4516
Signed-off-by: Doug Ledford <dledford at redhat.com>
.gitignore | 4 ++++
librdmacm.spec | 35 ++++++++++++++---------------------
sources | 2 +-
3 files changed, 19 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c3c664d..d9db66e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,7 @@ librdmacm-1.0.10.tar.gz
librdmacm-1.0.14.1.tar.gz
/librdmacm-1.0.15.tar.gz
librdmacm-1.0.15/
+/librdmacm-1.0.16.tar.gz
+/librdmacm-1.0.16/
+/librdmacm-1.0.17-0.gitc6bfc1c.tar.gz
+/librdmacm-1.0.17/
diff --git a/librdmacm.spec b/librdmacm.spec
index 3807413..75155b0 100644
--- a/librdmacm.spec
+++ b/librdmacm.spec
@@ -1,22 +1,14 @@
Name: librdmacm
-Version: 1.0.15
-Release: 2%{?dist}
+Version: 1.0.17
+Release: 0.gitc6bfc1c.1%{?dist}
Summary: Userspace RDMA Connection Manager
Group: System Environment/Libraries
License: GPLv2 or BSD
Url: http://www.openfabrics.org/
-Source: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz
-Patch1: 0001-rdma-verbs-Fix-race-polling-for-completions.patch
-Patch2: 0002-librdmacm-Fix-duplicate-free-of-connect.patch
-Patch3: 0003-librdmacm-Verify-size-of-route_len.patch
-Patch4: 0004-librdmacm-udaddy-Fix-resource-leak-in-case-of-error.patch
-Patch6: 0006-rdma-cma-minor-code-refactoring-when-saving-a-string.patch
-Patch7: 0007-librdmacm-Return-ECONNREFUSED-from-rdma_connect-on-r.patch
-Patch8: 0008-udaddy-ucmatose-allow-easy-setting-of-tos-in-hex.patch
-Patch9: 0009-librdmacm-Update-web-site-and-email-addresses.patch
+Source: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}-0.gitc6bfc1c.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: s390 s390x
-BuildRequires: libibverbs-devel > 1.1.4, chrpath
+BuildRequires: libibverbs-devel > 1.1.4, chrpath, libtool, autoconf
%description
librdmacm provides a userspace RDMA Communication Managment API.
@@ -46,26 +38,20 @@ Example test programs for the librdmacm library.
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
%build
+./autogen.sh
%configure LDFLAGS=-lpthread
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$CXXFLAGS -fno-strict-aliasing" LDFLAGS="-lpthread"
%install
rm -rf %{buildroot}
%makeinstall
# remove unpackaged files from the buildroot
rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/rsocket/*.la
# kill rpaths
chrpath -d %{buildroot}%{_bindir}/*
@@ -78,11 +64,13 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_libdir}/librdmacm*.so.*
+%{_libdir}/rsocket/*.so.*
%doc AUTHORS COPYING README
%files devel
%defattr(-,root,root)
%{_libdir}/lib*.so
+%{_libdir}/rsocket/lib*.so
%{_includedir}/*
%{_mandir}/man3/*
%{_mandir}/man7/*
@@ -90,6 +78,7 @@ rm -rf %{buildroot}
%files static
%defattr(-,root,root,-)
%{_libdir}/*.a
+%{_libdir}/rsocket/*.a
%files utils
%defattr(-,root,root,-)
@@ -97,6 +86,10 @@ rm -rf %{buildroot}
%{_mandir}/man1/*
%changelog
+* Thu Dec 06 2012 Doug Ledford <dledford at redhat.com> - 1.0.17-0.gitc6bfc1c.1
+- Update to upstream git repo version to pick up fix for CVE-2012-4516
+- Resolves: bz865510
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 6271fef..31ba071 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0053fd9a7368f04e72287923eb58ea36 librdmacm-1.0.15.tar.gz
+fc3068ad4c3399730fc6dd278e07e705 librdmacm-1.0.17-0.gitc6bfc1c.tar.gz
More information about the scm-commits
mailing list