[Pkg-ofed-commits] [ibsim] 04/05: Imported Debian patch 0.5-3
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Tue Jul 1 07:17:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository ibsim.
commit 16febef277f0b014afd7198abeee28f5f8c319f2
Author: Roland Dreier <rbd at debian.org>
Date: Mon Jan 14 11:43:39 2013 -0800
Imported Debian patch 0.5-3
---
debian/changelog | 17 +++++++++
debian/control | 2 +-
debian/patches/02_remove-ibcommon.patch | 54 +++++++++++++++++++++++++++++
debian/patches/03_fix-insecure-format.patch | 16 +++++++++
debian/patches/04_use-CPPFLAGS.patch | 16 +++++++++
debian/patches/series | 3 ++
debian/rules | 2 ++
7 files changed, 109 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index b27cb19..ee57296 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+ibsim (0.5-3) experimental; urgency=low
+
+ * Add missing versioned build dependency on dpkg-dev.
+
+ -- Roland Dreier <rbd at debian.org> Mon, 14 Jan 2013 11:43:39 -0800
+
+ibsim (0.5-2) experimental; urgency=low
+
+ * Acknowledge NMU.
+ * Add 02_remove-ibcommon.patch to remove build dependency on
+ libibcommon; it has been obsolete for a long time. This fixes
+ FTBFS due to conflicting definitions of ntohll.
+ * Add 03_fix-insecure-format.patch to fix FTBFS with hardening flags.
+ * Add 04_use-CPPFLAGS.patch so hardening flags are actually used.
+
+ -- Roland Dreier <rbd at debian.org> Mon, 14 Jan 2013 10:30:26 -0800
+
ibsim (0.5-1.1) unstable; urgency=low
* Non-maintainer upload; ACKed by the maintainer, see #664425.
diff --git a/debian/control b/debian/control
index c9bd6ae..6d0cef9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
Priority: extra
Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel at lists.alioth.debian.org>
Uploaders: Benoit Mortier <benoit.mortier at opensides.be>, Guy Coates <gmpc at sanger.ac.uk>, Mario Lang <mlang at debian.org>
-Build-Depends: debhelper (>= 9), libibumad-dev, libibmad-dev, libibcommon-dev
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libibumad-dev, libibmad-dev
Standards-Version: 3.9.3.1
Homepage: http://www.openfabrics.org
diff --git a/debian/patches/02_remove-ibcommon.patch b/debian/patches/02_remove-ibcommon.patch
new file mode 100644
index 0000000..478d5e5
--- /dev/null
+++ b/debian/patches/02_remove-ibcommon.patch
@@ -0,0 +1,54 @@
+Description: Remove vestiges of libibcommon use
+ We no longer need libibcommon for anything; remove the includes and
+ the link against it.
+Author: Roland Dreier <rbd at debian.org>
+
+Index: ibsim-0.5/ibsim/sim.h
+===================================================================
+--- ibsim-0.5.orig/ibsim/sim.h 2009-07-29 05:58:36.000000000 -0700
++++ ibsim-0.5/ibsim/sim.h 2013-01-14 01:43:56.254739452 -0800
+@@ -35,7 +35,6 @@
+ #ifndef __SIM_H__
+ #define __SIM_H__
+
+-#include <infiniband/common.h>
+ #include <infiniband/mad.h>
+
+ #define MAXNETNODES 2048
+Index: ibsim-0.5/umad2sim/sim_client.c
+===================================================================
+--- ibsim-0.5.orig/umad2sim/sim_client.c 2009-07-29 05:58:36.000000000 -0700
++++ ibsim-0.5/umad2sim/sim_client.c 2013-01-14 01:43:59.702739559 -0800
+@@ -45,7 +45,6 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+
+-#include <infiniband/common.h>
+ #include <infiniband/mad.h>
+
+ #include <ibsim.h>
+Index: ibsim-0.5/umad2sim/umad2sim.c
+===================================================================
+--- ibsim-0.5.orig/umad2sim/umad2sim.c 2013-01-14 00:45:57.000000000 -0800
++++ ibsim-0.5/umad2sim/umad2sim.c 2013-01-14 01:44:10.262739884 -0800
+@@ -50,7 +50,6 @@
+ #include <dlfcn.h>
+ #include <netinet/in.h>
+
+-#include <infiniband/common.h>
+ #include <infiniband/umad.h>
+ #include <infiniband/mad.h>
+
+Index: ibsim-0.5/defs.mk
+===================================================================
+--- ibsim-0.5.orig/defs.mk 2009-07-29 05:58:36.000000000 -0700
++++ ibsim-0.5/defs.mk 2013-01-14 01:46:36.950744390 -0800
+@@ -21,7 +21,7 @@
+ $(foreach l, mad umad common, $(IB_DEV_DIR)/libib$(l)/.libs/libib$(l).so)
+ else
+ INCS:= -I$(dir $(libpath))/include
+- LIBS:= -L$(libpath) -libmad -libumad -libcommon
++ LIBS:= -L$(libpath) -libmad -libumad
+ endif
+
+ CFLAGS += -Wall -g -fpic -I. -I../include $(INCS)
diff --git a/debian/patches/03_fix-insecure-format.patch b/debian/patches/03_fix-insecure-format.patch
new file mode 100644
index 0000000..0118d15
--- /dev/null
+++ b/debian/patches/03_fix-insecure-format.patch
@@ -0,0 +1,16 @@
+Description: Fix insecure fprintf() format
+Author: Roland Dreier <rbd at debian.org>
+
+Index: ibsim-0.5/ibsim/sim_cmd.c
+===================================================================
+--- ibsim-0.5.orig/ibsim/sim_cmd.c 2009-07-29 05:58:36.000000000 -0700
++++ ibsim-0.5/ibsim/sim_cmd.c 2013-01-14 10:56:22.391757631 -0800
+@@ -856,7 +856,7 @@
+ cmd_len++;
+
+ if (*line == '#')
+- fprintf(f, line);
++ fprintf(f, "%s", line);
+ else if (*line == '!')
+ r = sim_cmd_file(f, line);
+ else if (!strncasecmp(line, "Dump", cmd_len))
diff --git a/debian/patches/04_use-CPPFLAGS.patch b/debian/patches/04_use-CPPFLAGS.patch
new file mode 100644
index 0000000..e3fee4e
--- /dev/null
+++ b/debian/patches/04_use-CPPFLAGS.patch
@@ -0,0 +1,16 @@
+Description: Pass CPPFLAGS to compiler so all hardening flags are used
+Author: Roland Dreier <rbd at debian.org>
+
+Index: ibsim-0.5/defs.mk
+===================================================================
+--- ibsim-0.5.orig/defs.mk 2013-01-14 01:46:36.950744390 -0800
++++ ibsim-0.5/defs.mk 2013-01-14 11:04:24.983772454 -0800
+@@ -35,7 +35,7 @@
+ all:
+
+ %.o: %.c
+- $(CC) $(CFLAGS) -c -o $@ $<
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+ %.so:
+ $(CC) -shared $(LDFLAGS) -o $@ $^ $(LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index e1883da..6bf75b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
01_glibc-2.10-scandir.patch
+02_remove-ibcommon.patch
+03_fix-insecure-format.patch
+04_use-CPPFLAGS.patch
diff --git a/debian/rules b/debian/rules
index 8b68ca2..ffd423a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
configure: configure-stamp
configure-stamp:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/ibsim.git
More information about the Pkg-ofed-commits
mailing list