[Pkg-ofed-commits] [ibsim] 04/10: remove patches merges upstream

Ana Beatriz Guerrero López ana at moszumanska.debian.org
Tue Jul 1 12:41:43 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 a7b8e081c16f45f56f399104f9ab7093d1cc40f5
Author: Ana Guerrero López <ana at ekaia.org>
Date:   Tue Jul 1 14:18:41 2014 +0200

    remove patches merges upstream
---
 debian/changelog                            |  2 ++
 debian/patches/01_glibc-2.10-scandir.patch  | 16 ---------
 debian/patches/02_remove-ibcommon.patch     | 54 -----------------------------
 debian/patches/03_fix-insecure-format.patch | 16 ---------
 debian/patches/series                       |  3 --
 5 files changed, 2 insertions(+), 89 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 801f05b..e0c04d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ibsim (0.6-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove patches merges upstream: 01_glibc-2.10-scandir.patch,
+    02_remove-ibcommon.patch, 03_fix-insecure-format.patch
 
  -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 01 Jul 2014 14:15:30 +0200
 
diff --git a/debian/patches/01_glibc-2.10-scandir.patch b/debian/patches/01_glibc-2.10-scandir.patch
deleted file mode 100644
index 905a4a6..0000000
--- a/debian/patches/01_glibc-2.10-scandir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: <benoit.mortier at opensides.be>
-Subject: patch for glibc 2.10 scandir function
-
-
---- trunk/umad2sim/umad2sim.c	2009-07-29 14:58:36.000000000 +0200
-+++ trunk/umad2sim/new-umad2sim.c	2009-12-24 12:30:15.000000000 +0100
-@@ -698,7 +698,8 @@
- 
- int scandir(const char *path, struct dirent ***namelist,
- 	    int (*filter) (const struct dirent *),
--	    int (*compar) (const void *, const void *))
-+	    int (*compar)(const struct dirent **,const struct dirent **)) 
-+
- {
- 	char new_path[4096];
- 
diff --git a/debian/patches/02_remove-ibcommon.patch b/debian/patches/02_remove-ibcommon.patch
deleted file mode 100644
index 478d5e5..0000000
--- a/debian/patches/02_remove-ibcommon.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index 0118d15..0000000
--- a/debian/patches/03_fix-insecure-format.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/series b/debian/patches/series
index 6bf75b5..ff1fb6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-01_glibc-2.10-scandir.patch
-02_remove-ibcommon.patch
-03_fix-insecure-format.patch
 04_use-CPPFLAGS.patch

-- 
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