[Pkg-ofed-commits] [librdmacm] 18/18: Imported Debian patch 1.0.16-1
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Wed Jul 2 13:58:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository librdmacm.
commit bb6ba9fa0d3cab8f2556ade026dd5fddbd34d914
Merge: 2efccb5 3e676d3
Author: Roland Dreier <rbd at debian.org>
Date: Tue Oct 16 12:20:17 2012 -0700
Imported Debian patch 1.0.16-1
Makefile.am | 33 +-
Makefile.in | 1044 +-
aclocal.m4 | 13268 +++++----
config.h.in | 14 +-
config/compile | 142 -
config/config.guess | 292 +-
config/config.sub | 202 +-
config/depcomp | 172 +-
config/install-sh | 517 +-
config/ltmain.sh | 13217 +++++----
config/missing | 104 +-
configure | 29683 ++++++++-----------
configure.in | 40 +-
debian/changelog | 14 +-
debian/compat | 2 +-
debian/control | 5 +-
debian/librdmacm-dev.install | 4 +-
debian/librdmacm1.install | 3 +-
.../01-CVE-2012-4516-no-default-acm-port.patch | 28 +-
debian/patches/02-fix-manpage-nroff-errors.patch | 52 +
debian/patches/series | 1 +
debian/rules | 2 +-
examples/cmatose.c | 113 +-
examples/common.c | 74 +
examples/common.h | 50 +
examples/rcopy.c | 628 +
examples/rping.c | 2 +-
examples/rstream.c | 685 +
examples/udaddy.c | 79 +-
include/rdma/rdma_cma.h | 1 +
include/rdma/rdma_verbs.h | 48 +-
include/rdma/rsocket.h | 92 +
librdmacm.spec | 12 +-
librdmacm.spec.in | 10 +-
man/rcopy.1 | 37 +
man/rdma_disconnect.3 | 2 +-
man/rdma_getaddrinfo.3 | 16 +-
man/rsocket.7 | 89 +
man/rstream.1 | 66 +
src/acm.c | 193 +-
src/addrinfo.c | 6 +-
src/cma.c | 63 +-
src/cma.h | 54 +-
src/indexer.c | 166 +
src/indexer.h | 101 +
src/librdmacm.map | 26 +
src/preload.c | 704 +
src/rsocket.c | 2021 ++
48 files changed, 33322 insertions(+), 30855 deletions(-)
diff --cc debian/changelog
index 6604faf,0000000..e087bc8
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,84 -1,0 +1,92 @@@
- librdmacm (1.0.15-1+deb7u1) wheezy; urgency=high
++librdmacm (1.0.16-1) unstable; urgency=high
+
+ * Security fix: apply 01-CVE-2012-4516-no-default-acm-port.patch
+ (Closes: #690672)
-
- -- Roland Dreier <rbd at debian.org> Tue, 30 Oct 2012 11:48:07 -0700
++ * New upstream release.
++ - Add rsockets API and protocol.
++ - Add LD_PRELOAD-able librspreload to use rsockets transparently.
++ - Bug fixes.
++ * Update dh_makeshlibs call, since new rsockets API was added in 1.0.16.
++ * Update to Standards-Version: 3.9.4 (no changes needed).
++ * Apply 02-fix-manpage-nroff-errors.patch to fix lintian warnings.
++ * Update to debhelper 9.
++
++ -- Roland Dreier <rbd at debian.org> Tue, 16 Oct 2012 12:20:17 -0700
+
+librdmacm (1.0.15-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update dh_makeshlibs call, since new functions rdma_create_srq() and
+ rdma_destroy_srq() were added in 1.0.15.
+ * Drop link-with-pthread.patch (applied upstream).
+ * Don't use brace expansion for {a,so} in librdmacm-dev.install
+ * Update to Standards-Version: 3.9.3 (no changes needed).
+ * Update maintainer and remove DM-Upload-Allowed now that I'm a DD.
+
+ -- Roland Dreier <rbd at debian.org> Sun, 17 Jun 2012 18:01:31 -0700
+
+librdmacm (1.0.14.1-2) unstable; urgency=low
+
+ * Don't ship .la files. (Closes: #633229)
+
+ -- Roland Dreier <roland at digitalvampire.org> Tue, 12 Jul 2011 21:15:18 -0700
+
+librdmacm (1.0.14.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fix problem with some versions of cxgb3 driver
+ * Update to Standards-Version: 3.9.2 (no changes needed).
+ * Set DM-Upload-Allowed to yes.
+ * Still linking directly with libpthread. (Closes: #618071)
+
+ -- Roland Dreier <roland at digitalvampire.org> Wed, 20 Apr 2011 10:27:55 -0700
+
+librdmacm (1.0.14-1) experimental; urgency=low
+
+ * Switch to dpkg-source 3.0 (quilt) format.
+ * Update to Standards-Version: 3.9.1 (no changes needed).
+ * New upstream release.
+ - Add IPv6 support
+ - Add new higher-level, simpler API
+ - Add new client/server examples
+ * Link directly with libpthread. (Closes: #555380)
+
+ -- Roland Dreier <rolandd at cisco.com> Wed, 15 Dec 2010 11:24:19 -0800
+
+librdmacm (1.0.10-1) unstable; urgency=low
+
+ * Update to Standards-Version: 3.8.3 (no changes needed).
+ * Move -dbg package to section debug.
+ * Change build system from cdbs to debhelper 7.
+ * New upstream release:
+ - Many small fixes.
+
+ -- Roland Dreier <rolandd at cisco.com> Wed, 18 Nov 2009 15:40:14 -0800
+
+librdmacm (1.0.8-1) unstable; urgency=low
+
+ * New upstream release:
+ - Report address change and timewait exit events (requires
+ kernel 2.6.27).
+ - Minor enhancements to example programs.
+
+ -- Roland Dreier <rolandd at cisco.com> Fri, 08 Aug 2008 14:24:16 -0700
+
+librdmacm (1.0.7-1) unstable; urgency=low
+
+ * New upstream release:
+ - Set status correctly for rejects.
+ - Add new function rdma_migrate_id().
+ * We actually require libibverbs 1.1 (not 1.0) to build.
+ * Add debian/watch file.
+ * Use DEB_DH_MAKESHLIBS_ARGS_ALL to pass appropriate -V option to
+ dh_makeshlibs, since a new symbol rdma_migrate_id() was added in
+ librdmacm 1.0.7.
+
+ -- Roland Dreier <rolandd at cisco.com> Fri, 28 Mar 2008 20:44:44 -0700
+
+librdmacm (1.0.6-1) unstable; urgency=low
+
+ * Initial Release. (Closes: #462348)
+
+ -- Roland Dreier <rolandd at cisco.com> Tue, 05 Feb 2008 13:49:52 -0800
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index c0402a6,0000000..d362240
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,93 -1,0 +1,94 @@@
+Source: librdmacm
+Priority: extra
+Maintainer: Roland Dreier <rbd at debian.org>
- Build-Depends: autoconf, automake, libtool, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), libibverbs-dev (>= 1.1)
- Standards-Version: 3.9.3
++Build-Depends: autoconf, automake, libtool, debhelper (>= 9), dpkg-dev (>= 1.13.19), libibverbs-dev (>= 1.1)
++Standards-Version: 3.9.4
+Section: libs
+Homepage: http://www.openfabrics.org/
+
+Package: librdmacm1
+Section: libs
+Architecture: any
++Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Library for managing RDMA connections
+ librdmacm is a library that allows applications to set up reliable
+ connected and unreliable datagram transfers when using RDMA adapters.
+ It provides a transport-neutral interface in the sense that the same
+ code can be used for both InfiniBand and iWARP adapters. The
+ interface is based on sockets, but adapted for queue pair (QP) based
+ semantics: communication must use a specific RDMA device, and data
+ transfers are message-based.
+ .
+ librdmacm only provides communication management (connection setup
+ and tear-down) and works in conjunction with the verbs interface
+ provided by libibverbs, which provides the interface used to actually
+ transfer data.
+ .
+ This package contains the shared library.
+
+Package: librdmacm-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, librdmacm1 (= ${binary:Version})
+Description: Development files for the librdmacm library
+ librdmacm is a library that allows applications to set up reliable
+ connected and unreliable datagram transfers when using RDMA adapters.
+ It provides a transport-neutral interface in the sense that the same
+ code can be used for both InfiniBand and iWARP adapters. The
+ interface is based on sockets, but adapted for queue pair (QP) based
+ semantics: communication must use a specific RDMA device, and data
+ transfers are message-based.
+ .
+ librdmacm only provides communication management (connection setup
+ and tear-down) and works in conjunction with the verbs interface
+ provided by libibverbs, which provides the interface used to actually
+ transfer data.
+ .
+ This package is needed to compile programs against librdmacm1.
+ It contains the header files and static libraries (optionally)
+ needed for compiling.
+
+Package: librdmacm1-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, librdmacm1 (= ${binary:Version})
+Description: Debugging symbols for the librdmacm library
+ librdmacm is a library that allows applications to set up reliable
+ connected and unreliable datagram transfers when using RDMA adapters.
+ It provides a transport-neutral interface in the sense that the same
+ code can be used for both InfiniBand and iWARP adapters. The
+ interface is based on sockets, but adapted for queue pair (QP) based
+ semantics: communication must use a specific RDMA device, and data
+ transfers are message-based.
+ .
+ librdmacm only provides communication management (connection setup
+ and tear-down) and works in conjunction with the verbs interface
+ provided by libibverbs, which provides the interface used to actually
+ transfer data.
+ .
+ This package contains the debugging symbols associated with
+ librdmacm1. They will automatically be used by gdb for debugging
+ librdmacm-related issues.
+
+Package: rdmacm-utils
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Examples for the librdmacm library
+ librdmacm is a library that allows applications to set up reliable
+ connected and unreliable datagram transfers when using RDMA adapters.
+ It provides a transport-neutral interface in the sense that the same
+ code can be used for both InfiniBand and iWARP adapters. The
+ interface is based on sockets, but adapted for queue pair (QP) based
+ semantics: communication must use a specific RDMA device, and data
+ transfers are message-based.
+ .
+ librdmacm only provides communication management (connection setup
+ and tear-down) and works in conjunction with the verbs interface
+ provided by libibverbs, which provides the interface used to actually
+ transfer data.
+ .
+ This package contains useful librdmacm1 example programs such as
+ rping and udaddy.
diff --cc debian/librdmacm-dev.install
index b88ad31,0000000..8f649ea
mode 100644,000000..100644
--- a/debian/librdmacm-dev.install
+++ b/debian/librdmacm-dev.install
@@@ -1,5 -1,0 +1,5 @@@
+usr/include
- usr/lib/librdmacm*.a
- usr/lib/librdmacm*.so
++usr/lib/*/librdmacm*.a
++usr/lib/*/librdmacm*.so
+usr/share/man/man3
+usr/share/man/man7
diff --cc debian/librdmacm1.install
index 55d21c9,0000000..c17048e
mode 100644,000000..100644
--- a/debian/librdmacm1.install
+++ b/debian/librdmacm1.install
@@@ -1,1 -1,0 +1,2 @@@
- usr/lib/librdmacm*.so.*
++usr/lib/*/librdmacm*.so.*
++usr/lib/*/rsocket/librspreload*.so*
diff --cc debian/patches/01-CVE-2012-4516-no-default-acm-port.patch
index 9e1c9ef,0000000..c61529f
mode 100644,000000..100644
--- a/debian/patches/01-CVE-2012-4516-no-default-acm-port.patch
+++ b/debian/patches/01-CVE-2012-4516-no-default-acm-port.patch
@@@ -1,62 -1,0 +1,60 @@@
+From: Sean Hefty <sean.hefty at intel.com>
+Subject: Disable ACM support if ibacm.port is not found
+
+The librdmacm will try to connect port 6125 if ibacm.port is
+not found. The problem is that some other service or application
+could be using that port and respond with garbage. Rather
+than falling back to a hard coded port number, if ibacm.port
+is not found, simply disable ACM support.
+
+This has the effect of removing support for older versions
+of ibacm, unless the port file is created manually.
+
+Patch created based on feedback from Doug Ledford and Florian
+Weimer from RedHat.
+
+Origin: upstream, http://git.openfabrics.org/git?p=~shefty/librdmacm.git;a=commitdiff;h=4b5c1aa734e0e734fc2ba3cd41d0ddf02170af6d
+Bug: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-4516
+Bug-Debian: http://bugs.debian.org/690672
+---
- Index: librdmacm-1.0.15/src/acm.c
- ===================================================================
- --- librdmacm-1.0.15.orig/src/acm.c 2012-10-30 11:54:30.910048525 -0700
- +++ librdmacm-1.0.15/src/acm.c 2012-10-30 11:56:41.034052522 -0700
- @@ -49,8 +49,8 @@
- #include <infiniband/acm.h>
++diff --git a/src/acm.c b/src/acm.c
++index 3d8c912..c9ca5b5 100755
++--- a/src/acm.c
+++++ b/src/acm.c
++@@ -62,7 +62,7 @@ typedef struct acm_msg cma_acm_msg_t;
+
+ static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER;
- -static int sock;
++ static int sock = -1;
+-static short server_port = 6125;
- +static int sock = -1;
++static short server_port;
+
+ struct ib_connect_hdr {
+ uint8_t cma_version;
- @@ -64,7 +64,7 @@
++@@ -76,7 +76,7 @@ struct ib_connect_hdr {
+ #define cma_dst_ip6 dst_addr[0]
+ };
+
+-static void ucma_set_server_port(void)
++static int ucma_set_server_port(void)
+ {
+ FILE *f;
+
- @@ -72,6 +72,7 @@
++@@ -84,6 +84,7 @@ static void ucma_set_server_port(void)
+ fscanf(f, "%hu", (unsigned short *) &server_port);
+ fclose(f);
+ }
++ return server_port;
+ }
+
+ void ucma_ib_init(void)
- @@ -79,7 +80,9 @@
- struct sockaddr_in addr;
- int ret;
++@@ -96,7 +97,9 @@ void ucma_ib_init(void)
++ return;
+
++ pthread_mutex_lock(&acm_lock);
+- ucma_set_server_port();
++ if (!ucma_set_server_port())
- + return;
+++ goto out;
++
+ sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (sock < 0)
- return;
++ goto out;
diff --cc debian/patches/02-fix-manpage-nroff-errors.patch
index 0000000,0000000..361ca44
new file mode 100644
--- /dev/null
+++ b/debian/patches/02-fix-manpage-nroff-errors.patch
@@@ -1,0 -1,0 +1,52 @@@
++Description: Fix manpage formatting found by lintian warning
++ Putting 'r' at the beginning of a line in the nroff source for man pages
++ is confusing to nroff because lines that start with a single quote
++ character ' or a dot character . are treated as control lines, which is
++ not what's intended here. Some of the man page text ends up left out of
++ the formatted output.
++ .
++ Fix this by just wrapping the text slightly differently in the source
++ (which doesn't matter since nroff reflows the text anyway). Also add a
++ missing ".TP" so that the -p and -c options are not run together in the
++ formatted output.
++Forwarded: http://article.gmane.org/gmane.linux.drivers.rdma/13669
++Author: Roland Dreier <rbd at debian.org>
++---
++ man/rdma_xclient.1 | 5 +++--
++ man/rdma_xserver.1 | 5 +++--
++ 2 files changed, 6 insertions(+), 4 deletions(-)
++
++diff --git a/man/rdma_xclient.1 b/man/rdma_xclient.1
++index 087e7fe..b4bb045 100644
++--- a/man/rdma_xclient.1
+++++ b/man/rdma_xclient.1
++@@ -20,9 +20,10 @@ By default, the client will attempt to connect to the server using
++ \-p server_port
++ Specifies the port number that the server listens on. By default the server
++ listens on port 7471.
+++.TP
++ \-c communication type
++-Specifies the type of communication established with the server program.
++-'r' results in using a reliable-connected QP (the default). 'x' uses
+++Specifies the type of communication established with the server program. 'r'
+++results in using a reliable-connected QP (the default). 'x' uses
++ extended reliable-connected XRC QPs.
++ .SH "NOTES"
++ Basic usage is to start rdma_xserver, then connect to the server using the
++diff --git a/man/rdma_xserver.1 b/man/rdma_xserver.1
++index 75529e4..a26c962 100644
++--- a/man/rdma_xserver.1
+++++ b/man/rdma_xserver.1
++@@ -14,9 +14,10 @@ data.
++ \-p port
++ Changes the port number that the server listens on. By default the server
++ listens on port 7471.
+++.TP
++ \-c communication type
++-Specifies the type of communication established with the client program.
++-'r' results in using a reliable-connected QP (the default). 'x' uses
+++Specifies the type of communication established with the client program. 'r'
+++results in using a reliable-connected QP (the default). 'x' uses
++ extended reliable-connected XRC QPs.
++ .SH "NOTES"
++ Basic usage is to start rdma_xserver, then connect to the server using the
diff --cc debian/patches/series
index 9a8c312,0000000..5f64127
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+01-CVE-2012-4516-no-default-acm-port.patch
++02-fix-manpage-nroff-errors.patch
diff --cc debian/rules
index 1fb7841,0000000..23b6ab3
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,15 -1,0 +1,15 @@@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+%:
+ dh $@
+
+override_dh_strip:
+ dh_strip --dbg-package=librdmacm1-dbg
+
+override_dh_makeshlibs:
- dh_makeshlibs -V 'librdmacm1 (>= 1.0.15)'
++ dh_makeshlibs -V 'librdmacm1 (>= 1.0.16)'
+
+override_dh_auto_configure:
+ autoreconf -f -i
+ dh_auto_configure
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/librdmacm.git
More information about the Pkg-ofed-commits
mailing list