[Pkg-ofed-commits] [opensm] 07/07: Imported Debian patch 3.3.15-2
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Tue Jul 1 07:19:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository opensm.
commit dc397e42f031e26ac7ad716c7c3ff40a51ff28a1
Author: Roland Dreier <rbd at debian.org>
Date: Tue Nov 27 12:28:22 2012 -0800
Imported Debian patch 3.3.15-2
---
debian/changelog | 16 +
debian/compat | 2 +-
debian/control | 29 +-
debian/libopensm-dev.install | 4 +-
debian/libopensm5.install | 2 +-
debian/opensm-boot.init | 84 -----
debian/opensm.install | 1 -
debian/opensm.postinst | 8 -
debian/opensm.postrm | 6 -
debian/opensm.preinst | 11 +
debian/patches/01-fix-format-security.patch | 475 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 93 +-----
13 files changed, 524 insertions(+), 208 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7863836..4617a68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+opensm (3.3.15-2) experimental; urgency=low
+
+ * Add missing libopensm5 pre-depends on multiarch.
+ * opensm-doc is architecture independent.
+
+ -- Roland Dreier <rbd at debian.org> Tue, 27 Nov 2012 12:28:22 -0800
+
+opensm (3.3.15-1) experimental; urgency=low
+
+ * Acknowledge NMU.
+ * Update to debhelper 9 and minimized rule file.
+ * Source is in format 3.0. (Closes: #664434)
+ * Remove opensm-boot initscripts.
+
+ -- Roland Dreier <rbd at debian.org> Mon, 19 Nov 2012 13:53:55 -0800
+
opensm (3.3.15-0.1) experimental; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 6e0b4e2..53604a1 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 (>= 7), autotools-dev, flex, bison, libibumad-dev (>= 1.3.7-OFED-1.5.4)
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.13.19), dh-autoreconf, bison, flex, libibumad-dev (>= 1.3.7-OFED-1.5.4)
Standards-Version: 3.9.4
Homepage: http://www.openfabrics.org
DM-Upload-Allowed: yes
@@ -11,26 +11,27 @@ DM-Upload-Allowed: yes
Package: opensm
Architecture: i386 ia64 amd64 powerpc
Depends: ${misc:Depends}, libopensm5 (= ${binary:Version}), ${shlibs:Depends}, infiniband-diags
-Description: An Infiniband subnet manager
- OpenSM provides an implementation of an Infiniband Subnet Manager (SM) and
- Administrator (SA). One Subnet Manager is required to run on each Infiniband
- subnet in order to initialize the Infiniband hardware.
+Description: InfiniBand subnet manager
+ OpenSM provides an implementation of an InfiniBand Subnet Manager (SM) and
+ Administrator (SA). One Subnet Manager is required to run on each InfiniBand
+ subnet in order to initialize the InfiniBand hardware.
Package: opensm-doc
Section: doc
-Architecture: i386 ia64 amd64 powerpc
+Architecture: all
Depends: ${misc:Depends}
Description: Documentation for opensm
- Documentation for the opensm Infiniband subnet manager.
+ Documentation for the opensm InfiniBand subnet manager.
Package: libopensm5
Architecture: i386 ia64 amd64 powerpc
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: libopensm2, libopensm4
-Description: Infiniband subnet manager libraries
- OpenSM provides an implementation of an Infiniband Subnet Manager (SM) and
- Administrator (SA). One Subnet Manager is required to run on each Infiniband
- subnet in order to initialize the Infiniband hardware.
+Description: InfiniBand subnet manager libraries
+ OpenSM provides an implementation of an InfiniBand Subnet Manager (SM) and
+ Administrator (SA). One Subnet Manager is required to run on each InfiniBand
+ subnet in order to initialize the InfiniBand hardware.
.
This package contains shared libraries that are part of the opensm package
but are also used by other applications.
@@ -42,9 +43,9 @@ Depends: libopensm5 (= ${binary:Version}), ${misc:Depends}
Conflicts: libopensm2-dev
Replaces: libopensm2-dev
Description: Header files for compiling against libopensm
- OpenSM provides an implementation of an Infiniband Subnet Manager (SM) and
- Administrator (SA). One Subnet Manager is required to run on each Infiniband
- subnet in order to initialize the Infiniband hardware.
+ OpenSM provides an implementation of an InfiniBand Subnet Manager (SM) and
+ Administrator (SA). One Subnet Manager is required to run on each InfiniBand
+ subnet in order to initialize the InfiniBand hardware.
.
This package contains the header files for compiling applications
against libopensm.
diff --git a/debian/libopensm-dev.install b/debian/libopensm-dev.install
index d1bffed..a3c8f6c 100644
--- a/debian/libopensm-dev.install
+++ b/debian/libopensm-dev.install
@@ -1,3 +1,3 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff --git a/debian/libopensm5.install b/debian/libopensm5.install
index d0dbfd1..3ddde58 100644
--- a/debian/libopensm5.install
+++ b/debian/libopensm5.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/opensm-boot.init b/debian/opensm-boot.init
deleted file mode 100644
index 6c1bec3..0000000
--- a/debian/opensm-boot.init
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: opensm-boot
-# Required-Start: $remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start: S
-# Default-Stop:
-# Short-Description: Start opensm subnet manager.
-# Description: Enable opensm subnet manager.
-### END INIT INFO
-
-PORTS=""
-[ -f /etc/default/opensm ] && . /etc/default/opensm
-
-[ -x /usr/sbin/opensm ] || exit 0
-
-if [ ! -f /sys/class/infiniband_mad/abi_version ] ; then
-echo "No infiniband adapters found."
-exit 0
-fi
-
-
-start () {
-
-if [ "$PORTS" = "ALL" ]; then
-PORTS=`/usr/sbin/ibstat -p`
-fi
-
-if [ "$PORTS" = "NONE" ]; then
-echo "opensm disabled."
-exit 0
-fi
-
-for PORT in $PORTS ; do
- echo -n "Starting opensm on $PORT: "
- start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/opensm-$PORT --background --exec /usr/sbin/opensm -- -g $PORT -f /var/log/opensm.$PORT.log
- RETVAL=$?
- echo
-done
-}
-
-stop () {
-
-if [ "$PORTS" = "ALL" ]; then
-PORTS=`/usr/sbin/ibstat -p`
-fi
-
-if [ "$PORTS" = "NONE" ]; then
- echo "opensm disabled."
- exit 0
-fi
-for PORT in $PORTS ; do
- echo -n "Shutting down opensm: "
- start-stop-daemon --stop --pidfile /var/run/opensm-$PORT
- RETVAL=$?
- echo
-done
-}
-
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart | force-reload )
- stop
- start
- ;;
- reload)
- echo "Reloading opensm configuration..."
- killall -HUP opensm
- RETVAL=$?
- echo "done"
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|reload|force-reload}"
- RETVAL=1
- ;;
-esac
-
-exit $RETVAL;
diff --git a/debian/opensm.install b/debian/opensm.install
index c4cf6a4..b174b44 100644
--- a/debian/opensm.install
+++ b/debian/opensm.install
@@ -1,3 +1,2 @@
usr/sbin
usr/share/man/man8
-etc/init.d/opensm-boot
diff --git a/debian/opensm.postinst b/debian/opensm.postinst
index 34e3041..a2c66fa 100644
--- a/debian/opensm.postinst
+++ b/debian/opensm.postinst
@@ -1,11 +1,3 @@
#!/bin/sh
-set -e
-
-. /usr/share/debconf/confmodule
-
-if [ "$1" = configure ] && [ -x "/etc/init.d/opensm-boot" ]; then
- update-rc.d opensm-boot start 24 S . > /dev/null
-fi
-
#DEBHELPER#
diff --git a/debian/opensm.postrm b/debian/opensm.postrm
index f8f789e..a2c66fa 100644
--- a/debian/opensm.postrm
+++ b/debian/opensm.postrm
@@ -1,9 +1,3 @@
#!/bin/sh
-set -e
-
-if [ "$1" = "purge" ] ; then
- update-rc.d opensm-boot remove >/dev/null || exit $?
-fi
-
#DEBHELPER#
diff --git a/debian/opensm.preinst b/debian/opensm.preinst
new file mode 100644
index 0000000..ed92e17
--- /dev/null
+++ b/debian/opensm.preinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+install|upgrade)
+ rm_conffile opensm /etc/init.d/opensm-boot || true
+ update-rc.d opensm-boot remove || true
+esac
+
+#DEBHELPER#
diff --git a/debian/patches/01-fix-format-security.patch b/debian/patches/01-fix-format-security.patch
new file mode 100644
index 0000000..4a6627e
--- /dev/null
+++ b/debian/patches/01-fix-format-security.patch
@@ -0,0 +1,475 @@
+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
new file mode 100644
index 0000000..16cb061
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-fix-format-security.patch
diff --git a/debian/rules b/debian/rules
index 4f63e0f..baa138d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,94 +1,5 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
-
-
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
- ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
- --sysconfdir=/etc --localstatedir=/var/run
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/opensm.sgml > opensm.1
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
-
- dh_clean
-
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/opensm.
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- rm -f $(CURDIR)/debian/tmp/usr/lib/lib*.la
- cp $(CURDIR)/debian/opensm-boot.init $(CURDIR)/debian/tmp/etc/init.d/opensm-boot
-
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install --list-missing
- dh_installdebconf
- dh_installlogrotate
- dh_installinit
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs -V
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+ dh $@ --with autoreconf
--
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