[Pkg-ofed-commits] [opensm] 05/14: remove patch 01-fix-format-security.patch, merged upstream
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Mon Jun 30 14:06:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to annotated tag debian/3.3.17-1
in repository opensm.
commit 4b967b6f9e0ba508ec7141574b8f0f73788cbd15
Author: Ana Guerrero López <ana at ekaia.org>
Date: Fri Jun 27 16:13:22 2014 +0200
remove patch 01-fix-format-security.patch, merged upstream
---
debian/changelog | 1 +
debian/patches/01-fix-format-security.patch | 475 ----------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 476 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ca63f4f..2338c9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ opensm (3.3.17-1) UNRELEASED; urgency=medium
* Remove DM-Upload-Allowed flag.
* Remove all current Uploaders, they're welcome back anytime. Add myself
to Uploaders.
+ * Remove patch 01-fix-format-security.patch, merged upstream.
-- Ana Beatriz Guerrero Lopez <ana at debian.org> Fri, 27 Jun 2014 15:22:27 +0200
diff --git a/debian/patches/01-fix-format-security.patch b/debian/patches/01-fix-format-security.patch
deleted file mode 100644
index 4a6627e..0000000
--- a/debian/patches/01-fix-format-security.patch
+++ /dev/null
@@ -1,475 +0,0 @@
-Description: Fix gcc "-Werror=format-security" errors
- Fix log calls to use format "%s" to output string buffers.
-Author: Roland Dreier <rbd at debian.org>
-Index: opensm-3.3.15/opensm/osm_helper.c
-===================================================================
---- opensm-3.3.15.orig/opensm/osm_helper.c 2012-08-02 00:03:56.000000000 -0700
-+++ opensm-3.3.15/opensm/osm_helper.c 2012-11-19 14:30:49.935527654 -0800
-@@ -888,7 +888,7 @@
- osm_dump_port_info_to_buf(node_guid, port_guid,
- port_num, p_pi, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
-
- /* show the capabilities mask */
- if (p_pi->capability_mask) {
-@@ -910,7 +910,7 @@
- osm_dump_port_info_to_buf(node_guid, port_guid,
- port_num, p_pi, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
-
- /* show the capabilities mask */
- if (p_pi->capability_mask) {
-@@ -955,7 +955,7 @@
- osm_dump_mlnx_ext_port_info_to_buf(node_guid, port_guid,
- port_num, p_pi, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -970,7 +970,7 @@
- osm_dump_mlnx_ext_port_info_to_buf(node_guid, port_guid,
- port_num, p_pi, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -1072,7 +1072,7 @@
-
- osm_dump_portinfo_record_to_buf(p_pir, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
-
- /* show the capabilities mask */
- if (p_pi->capability_mask) {
-@@ -1094,7 +1094,7 @@
-
- osm_dump_portinfo_record_to_buf(p_pir, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
-
- /* show the capabilities mask */
- if (p_pi->capability_mask) {
-@@ -1146,7 +1146,7 @@
- osm_dump_guid_info_to_buf(node_guid, port_guid,
- block_num, p_gi, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -1162,7 +1162,7 @@
- osm_dump_guid_info_to_buf(node_guid, port_guid,
- block_num, p_gi, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -1207,7 +1207,7 @@
-
- osm_dump_guidinfo_record_to_buf(p_gir, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -1221,7 +1221,7 @@
-
- osm_dump_guidinfo_record_to_buf(p_gir, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -1264,7 +1264,7 @@
-
- osm_dump_node_info_to_buf(p_ni, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -1276,7 +1276,7 @@
-
- osm_dump_node_info_to_buf(p_ni, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -1333,7 +1333,7 @@
-
- osm_dump_node_record_to_buf(p_nr, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -1347,7 +1347,7 @@
-
- osm_dump_node_record_to_buf(p_nr, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -1401,7 +1401,7 @@
-
- osm_dump_path_record_to_buf(p_pr, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -1413,7 +1413,7 @@
-
- osm_dump_path_record_to_buf(p_pr, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -1486,7 +1486,7 @@
-
- osm_dump_multipath_record_to_buf(p_mpr, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -1500,7 +1500,7 @@
-
- osm_dump_multipath_record_to_buf(p_mpr, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -1547,7 +1547,7 @@
-
- osm_dump_mc_record_to_buf(p_mcmr, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -1559,7 +1559,7 @@
-
- osm_dump_mc_record_to_buf(p_mcmr, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -1664,7 +1664,7 @@
-
- osm_dump_service_record_to_buf(p_sr, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -1678,7 +1678,7 @@
-
- osm_dump_service_record_to_buf(p_sr, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -1768,7 +1768,7 @@
- else
- osm_dump_inform_info_to_buf(p_ii, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -1785,7 +1785,7 @@
- else
- osm_dump_inform_info_to_buf(p_ii, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -1897,7 +1897,7 @@
- else
- osm_dump_inform_info_record_to_buf(p_iir, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -1914,7 +1914,7 @@
- else
- osm_dump_inform_info_record_to_buf(p_iir, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -1945,7 +1945,7 @@
-
- osm_dump_link_record_to_buf(p_lr, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -1959,7 +1959,7 @@
-
- osm_dump_link_record_to_buf(p_lr, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -2002,7 +2002,7 @@
-
- osm_dump_switch_info_to_buf(p_si, buf);
-
-- osm_log(p_log, OSM_LOG_VERBOSE, buf);
-+ osm_log(p_log, OSM_LOG_VERBOSE, "%s", buf);
- }
- }
-
-@@ -2016,7 +2016,7 @@
-
- osm_dump_switch_info_to_buf(p_si, buf);
-
-- osm_log_v2(p_log, OSM_LOG_VERBOSE, file_id, buf);
-+ osm_log_v2(p_log, OSM_LOG_VERBOSE, file_id, "%s", buf);
- }
- }
-
-@@ -2066,7 +2066,7 @@
-
- osm_dump_switch_info_record_to_buf(p_sir, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -2080,7 +2080,7 @@
-
- osm_dump_switch_info_record_to_buf(p_sir, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -2120,7 +2120,7 @@
- osm_dump_pkey_block_to_buf(port_guid, block_num, port_num,
- p_pkey_tbl, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -2136,7 +2136,7 @@
- osm_dump_pkey_block_to_buf(port_guid, block_num,
- port_num, p_pkey_tbl, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -2179,7 +2179,7 @@
- osm_dump_slvl_map_table_to_buf(port_guid, in_port_num,
- out_port_num, p_slvl_tbl, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -2195,7 +2195,7 @@
- osm_dump_slvl_map_table_to_buf(port_guid, in_port_num,
- out_port_num, p_slvl_tbl, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -2237,7 +2237,7 @@
- osm_dump_vl_arb_table_to_buf(port_guid, block_num,
- port_num, p_vla_tbl, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -2253,7 +2253,7 @@
- osm_dump_vl_arb_table_to_buf(port_guid, block_num,
- port_num, p_vla_tbl, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -2285,7 +2285,7 @@
-
- osm_dump_sm_info_to_buf(p_smi, buf);
-
-- osm_log(p_log, OSM_LOG_DEBUG, buf);
-+ osm_log(p_log, OSM_LOG_DEBUG, "%s", buf);
- }
- }
-
-@@ -2297,7 +2297,7 @@
-
- osm_dump_sm_info_to_buf(p_smi, buf);
-
-- osm_log_v2(p_log, OSM_LOG_DEBUG, file_id, buf);
-+ osm_log_v2(p_log, OSM_LOG_DEBUG, file_id, "%s", buf);
- }
- }
-
-@@ -2336,7 +2336,7 @@
-
- osm_dump_sm_info_record_to_buf(p_smir, buf);
-
-- osm_log(p_log, OSM_LOG_DEBUG, buf);
-+ osm_log(p_log, OSM_LOG_DEBUG, "%s", buf);
- }
- }
-
-@@ -2350,7 +2350,7 @@
-
- osm_dump_sm_info_record_to_buf(p_smir, buf);
-
-- osm_log_v2(p_log, OSM_LOG_DEBUG, file_id, buf);
-+ osm_log_v2(p_log, OSM_LOG_DEBUG, file_id, "%s", buf);
- }
- }
-
-@@ -2569,7 +2569,7 @@
- else
- osm_dump_notice_to_buf(p_ntci, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -2585,7 +2585,7 @@
- else
- osm_dump_notice_to_buf(p_ntci, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -2700,7 +2700,7 @@
-
- osm_dump_dr_smp_to_buf(p_smp, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -2712,7 +2712,7 @@
-
- osm_dump_dr_smp_to_buf(p_smp, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -2774,7 +2774,7 @@
-
- osm_dump_sa_mad_to_buf(p_mad, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -2786,7 +2786,7 @@
-
- osm_dump_sa_mad_to_buf(p_mad, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -2814,7 +2814,7 @@
-
- osm_dump_dr_path_to_buf(p_path, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -2826,7 +2826,7 @@
-
- osm_dump_dr_path_to_buf(p_path, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
-@@ -2858,7 +2858,7 @@
-
- osm_dump_smp_dr_path_to_buf(p_smp, buf);
-
-- osm_log(p_log, log_level, buf);
-+ osm_log(p_log, log_level, "%s", buf);
- }
- }
-
-@@ -2870,7 +2870,7 @@
-
- osm_dump_smp_dr_path_to_buf(p_smp, buf);
-
-- osm_log_v2(p_log, log_level, file_id, buf);
-+ osm_log_v2(p_log, log_level, file_id, "%s", buf);
- }
- }
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 16cb061..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-fix-format-security.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/opensm.git
More information about the Pkg-ofed-commits
mailing list