[Pkg-ofed-commits] [librdmacm] 03/07: New release. Update Maintainers and Uploaders
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Tue Aug 19 14:03: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 46a88076ef98dfcbf66a5a1ab10dff399890d538
Author: Ana Guerrero López <ana at ekaia.org>
Date: Tue Aug 19 15:25:02 2014 +0200
New release. Update Maintainers and Uploaders
---
debian/changelog | 11 ++++
debian/control | 3 +-
.../01-CVE-2012-4516-no-default-acm-port.patch | 60 ----------------------
debian/patches/02-fix-manpage-nroff-errors.patch | 52 -------------------
debian/patches/series | 2 -
5 files changed, 13 insertions(+), 115 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e087bc8..2720afa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+librdmacm (1.0.19-1) UNRELEASED; urgency=medium
+
+ * New upstream release. (Closes: #755217)
+ * Remove patch 01-CVE-2012-4516-no-default-acm-port.patch merged upstream.
+ * Move to maintenance under the pkg-ofed team:
+ - Set Maintainer field to the team's name.
+ - Move rbd to Uploaders.
+ - Add myself to Uploaders.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Tue, 19 Aug 2014 14:51:07 +0200
+
librdmacm (1.0.16-1) unstable; urgency=high
* Security fix: apply 01-CVE-2012-4516-no-default-acm-port.patch
diff --git a/debian/control b/debian/control
index d362240..1b566ce 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
Source: librdmacm
Priority: extra
-Maintainer: Roland Dreier <rbd at debian.org>
+Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel at lists.alioth.debian.org>
+Uploaders: Roland Dreier <rbd at debian.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>
Build-Depends: autoconf, automake, libtool, debhelper (>= 9), dpkg-dev (>= 1.13.19), libibverbs-dev (>= 1.1)
Standards-Version: 3.9.4
Section: libs
diff --git a/debian/patches/01-CVE-2012-4516-no-default-acm-port.patch b/debian/patches/01-CVE-2012-4516-no-default-acm-port.patch
deleted file mode 100644
index c61529f..0000000
--- a/debian/patches/01-CVE-2012-4516-no-default-acm-port.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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
----
-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 = -1;
--static short server_port = 6125;
-+static short server_port;
-
- struct ib_connect_hdr {
- uint8_t cma_version;
-@@ -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;
-
-@@ -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)
-@@ -96,7 +97,9 @@ void ucma_ib_init(void)
- return;
-
- pthread_mutex_lock(&acm_lock);
-- ucma_set_server_port();
-+ if (!ucma_set_server_port())
-+ goto out;
-+
- sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0)
- goto out;
diff --git a/debian/patches/02-fix-manpage-nroff-errors.patch b/debian/patches/02-fix-manpage-nroff-errors.patch
deleted file mode 100644
index 361ca44..0000000
--- a/debian/patches/02-fix-manpage-nroff-errors.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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 --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5f64127..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-CVE-2012-4516-no-default-acm-port.patch
-02-fix-manpage-nroff-errors.patch
--
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