Fix bugs 387623, 531980, 533676.

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.15/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

10 files changed, 165 insertions, 29 deletions

diff --git a/sys-infiniband/opensm/ChangeLog b/sys-infiniband/opensm/ChangeLog
index 902d66f3890b..411c961bd2fe 100644
--- a/sys-infiniband/opensm/ChangeLog
+++ b/sys-infiniband/opensm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-infiniband/opensm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/ChangeLog,v 1.6 2014/04/16 08:22:28 alexxy Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/ChangeLog,v 1.7 2015/02/11 04:45:41 bircoph Exp $
+
+*opensm-3.3.17-r1 (11 Feb 2015)
+
+  11 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> -opensm-3.3.17.ebuild,
+  +opensm-3.3.17-r1.ebuild, +files/opensm-3.3.17-norpm.patch,
+  +files/opensm-3.3.17-sldd.patch, +files/opensm.conf.d, files/opensm.init.d,
+  +files/sldd.conf.d, +files/sldd.init.d, metadata.xml:
+  Use OSM_OPTIONS in both conf.d and init.d, wrt bug 387623.
+  Disable rpm calls, this fixes sandbox violation if rpm is
+  installed, wrt bug 531980.
+  Add option to install sldd daemon, wrt bug 533676.
 
 *opensm-3.3.17 (16 Apr 2014)
 
diff --git a/sys-infiniband/opensm/Manifest b/sys-infiniband/opensm/Manifest
index 076a8682eee9..7f8335f44386 100644
--- a/sys-infiniband/opensm/Manifest
+++ b/sys-infiniband/opensm/Manifest
@@ -1,27 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX opensm.init.d 632 SHA256 6250dec944d6636e294b84a90332bf4f1ab1122cd5c9b1037b3d2327a81168da SHA512 1b4a43897d7b87142e7aa24ec619706b96ca3f76f92b411262b31c63f8aaa3340db0cade7547e9a5ca9307fe017ad1f12f4aae927aa54de2e6facd1a53c40e7a WHIRLPOOL cf9c2634ca0332bd3131e910fba30921f2dc83680a627d101f82098f969f5574a03d5cd213f5d76c546283cedc435a21e8d4747d9b48c46a24b83f66b105ae48
+AUX opensm-3.3.17-norpm.patch 1613 SHA256 f9e73bfd04442f94228028ecbf0f65b49724dea82f9840a196c7790a1b4f0739 SHA512 6728f0463765f95dce6c04cb0c12460050914b56146105c31f5ed4a69de9351c704f02421073843024a01d733eaecd042549eb6b69bb50556b353c2dbc11819f WHIRLPOOL 3d6c3f3b70114474160af0406759a66529f786713568b73f65b86d6c2e8341dce3ef192681f0d14aa5c92838ecd94e3ded66df00d92df523af56a406e987ffb9
+AUX opensm-3.3.17-sldd.patch 541 SHA256 ba2b81c50fe655303b81d065e2aa8ac8688bc7ef2ef363ff7bd936cfbb79e8f5 SHA512 9125578de137f99cb7efbeb9d6f28a415fb0ec4fa8bd25332ea9844470db126e8b5d04bc67f659bc1bd656049311f766fb1d384110de642f8f6f0269e205f602 WHIRLPOOL bafacd91502b308e0fc24653f15524978371c88bb538ceb6882d66f91295b0ca505392352491b32a35c99d2736dd4e85f9fafea3b4c18fb85d4484898a95e9eb
+AUX opensm.conf.d 75 SHA256 9b0999f647f78651ac759a1c6fc9e2648bb5fdb2f4290e32eec6f971b8591b5a SHA512 19f03452eff5134a594a95eeef9397d7b2bf17ce8da9123f7f85a4bc924bc6762db119cbdbf5bd7f91f618acbf08d7e3e4097424bce5d4ba1f5789ec94cd2be2 WHIRLPOOL 86ad8d24aa24c1f974451835aa56d4c60415e6b28f95690f250ba948f52ac06327ce852d2e52e0f8324172169950bdc76df421e3de76a951e01f1490108766a2
+AUX opensm.init.d 637 SHA256 009c26078ed22502bd5f2b2308eeb95dead1b524a09eb40519c212831324c33d SHA512 310ebfd161e40b947c94549480238c5c84fc4bde397406ee5ad257f8cf0b76cbed821d8783dc562ec8a3a17060d203aa7a8f05dfe5ef6a899b7a046a8bac62c1 WHIRLPOOL 51356557cdf714e561ecf77e71b15a03ee198aae473b6b7d7eb65582a06b63c46c0b53cbd620698a912c2eeb749c5a85e710c94df474825811599c3441c38180
+AUX sldd.conf.d 459 SHA256 c032c53111700a70c52145073bacef96be08ac3fb170ceeecdfdb1209cc9b9ab SHA512 d68dd5839db3f193a05f47aaa77d281134a370385c7235b59ac079d9dbc65fbe3292beb82f60a49239d1a308ac384bc7fd71ce5d2ecf5c9b29a182280cf18a35 WHIRLPOOL e776552768070b21d38005714d0605c0fbe2cd014a81db82497e15abd7e93f9311dd59e9df2ecb92ea4d8152144737932db41073aab0303df8aad25c2c4077ca
+AUX sldd.init.d 726 SHA256 6227ea8384298d8133d3964bbdadfeffc53ad26ed5bbb0b3b3bbba19350f0909 SHA512 36d754d3cf826084f9d7ecac92269911f2481109655977527cf07e633bab8f7ac742b034e9ec7b5ac6346a691de668e4d52d921ef10fb802d5dd55f8cf90b9b9 WHIRLPOOL cef65e44062a642474b35434bc91a6367e0214ea61bac3503ed479c8834b56287d5b0226e0329bc56a69a9545f4fdf9c0cfc410c1fcb6853df7f07380be74525
 DIST OFED-3.12-rc1.tgz 22055476 SHA256 14ca8a2b0d68e3ee9a37f475fa9eecd9a5ffd6055135f9d4d9db8319843a94dc SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944 WHIRLPOOL 5a64b1d952890ea0e72e0ca93654a0fabc8f871475b05fcbe3b214ddfe4836f6b92d4fbc9e0f0d79acfe69d8c8d219b2c467c23654021e23eaf85ae6825ea4a9
 DIST OFED-3.5-rc2.tgz 18600237 SHA256 b267cea49bf72790843e6b08e26c10a6954d7736a8b93deed1e632772f4f5fff SHA512 deb83c3417ac60bd5d4c6ac1cadf93d6a34a55ca58365b54bb0c3a8230ba6a7f13e0257515dac0170cc4ab46b558519c86e6c01f7fa49550162feed0b0ea2e89 WHIRLPOOL e6843593fbe4937ffcf600be9cb3dee78e14cbeb4c411a4b64076b1194653cbcb9d4bc6cbd52ad77ac9c6b14d4dd2cdafa4364bfe6924b55896844042aa4d9cd
 EBUILD opensm-3.3.15.ebuild 1198 SHA256 ae1c9341b2e69c2a550bf1453d8954a1431393091266e6d0761d6916604a9de5 SHA512 f8dcf8713d75798df0a810e28d3bc30a972809289bb4daf8eaf00825e9b7e583df1101e8eaba462880625d48d0ff2e3e2f45cfd95b27395ae9f883a78b1b716b WHIRLPOOL e79ba247600b294fb3fa6f7f2ebbf19487b936a0d67c6d303f591c4ef9990e146e3f4d31a606fd6845352988df9c2fc2281a274651bad0f740bf896118ab8fbc
-EBUILD opensm-3.3.17.ebuild 1199 SHA256 0094ef0ec0986f4b559ec0788bbf742a3941e2f052ec96aaa851bb296759fc88 SHA512 cf45bd70043ee692b1c2c205e372cb931cdef11dc2f9675878bf2d9196d87ab832cec68e9f0a66e98a694c338a3726284a26f5981574cfff66760d5c8bb520e2 WHIRLPOOL 93e4d3bf9952ed2637429a66cbe278d2f8b6707dacc1746925233d776e245d12ef5b2ba0a1519737306d3936c35c28489b7c1bb100832d6bbeaad8ed2a6b7620
-MISC ChangeLog 1097 SHA256 62d8b88b45d8cb342df55b1d3eeb2aba3778d04212187b0900986c447aeb8e5e SHA512 ef77004542345c050eff1184e1079c6d331c0631bd431e773a45aa623e6aa689984d9d128092ce693db6f4078f0a43846ae0261f354e978d0be17b4ca6580bab WHIRLPOOL a38e37afaefbdb57a0be2a8b9eaa355a6deed70d932955a9aeeca22f927988a06e41329ceef5b7c425eec1620a0377ed349c907d1d12ed5afb744b850f918233
-MISC metadata.xml 421 SHA256 78b506cf13aff9269660e6e54f6c27e82e8359c52746036c43841feb140907f8 SHA512 fbcf1c5eb846f4a8c6e1b9e0335c0b2e8f497792045690302e8424c254be8537c30e857aeba02c4a5eefba6c03890dae43f16d39b743c0628999f5c0b888766e WHIRLPOOL 4b6ab3e687f5aa20c7b9f3b3608835dbad6d0771df2a1c51b70805e1cec38eb868e89bc8795fe63883a2f2393ed1e023931533dfdc99333a8dab1ca1d3da5d97
+EBUILD opensm-3.3.17-r1.ebuild 1497 SHA256 7371454e26eb3310bb351fec42f1f05f4c0e0d6f48af4b0ed5961ba250dc125a SHA512 77c4a05199f8785231397ae2ed5f1c6f553722f3849362e7267f0dd06f4f5a7f08244cd35fb8ab9d28add263e86c6a9bdd731d809b515c07499455f34144a3cf WHIRLPOOL f0b2ff96f2ce513e28479cd29785d81200b32dabd852f6de336714ef4708fab9d690b223a68d34fbf90c0e5d1d197afe9ce823a2b567d77cb779d0842e001ec3
+MISC ChangeLog 1607 SHA256 fa43208573843dd1dce41ad5ee6f5b2574e6b3b1c1f7aa1765efa0a29fdbb8a7 SHA512 2be91c827ccda50a8fb87ae79422fdcc4e7708a1143ffcbfe0b151fe9bec18004e3350610949a5e605e1f0cf4f644d1c7c386bc6592284c814b8394b4d33c808 WHIRLPOOL f728f6188522f4cb99ddb9d7ebbd7ac801be9713cec473b0a5a7262271b62ccc10041efc0a2132d3ba75ee4e01b2e95ec9f4ed081847299faec5138b1a3d8daf
+MISC metadata.xml 485 SHA256 d9389b6c1a67fe3b161de43bf88a0bdd99cf24b675aca8821e8d9b2b73fb2469 SHA512 589530e67e4856cf19f75d69c6f79e8977f8111e2fb997e080819a659a26eaf50c3e22e015cafa77fa147a1cb5728ad764cd83cc0aad8eeb1197441b8ada3d7e WHIRLPOOL 6af50fd520084ad3ec457035cd490ee7238c72e2a812850d9a89f2f64297bba0459184a98c974ef68a7097506facb15af96837afe6fe7879fe44e91946a16a88
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTTj3iAAoJEOf+E+/4L5Lm2N0P/ibym7ySPIlrRcHKQnjeSZJE
-H38HBeeEwK+oRlbS7hBxLhaXMj2S4D4VlIHNkk9nmQI3GKK72rY+Qhy/gkL7cWIC
-6OkxU+cMcGrH5SaPgar1ZfUinS5jtgUVdfFtY+nb1nK4tBqjutMhzWFNaxYtf5pe
-dMSmnCyfgu66Tio8SOS0/96BjBZ6QmMMkD/o41wd/QZFzc+sVmqFN0eQycO6b2om
-ueii6+PU7CUb9lW63d4te0AnBO4h2IoAkVWzNribfIk04IIpaWDxOzs+G0qLwUFD
-fOiPryxPVvHvOxqc/ymyizZZldTNsme/B33r9u8/wlooS+PPfNdDP0hQ28JTaZh9
-pQLfZU7RZ3yM8pCY0ttBHgLOW+Fdshy4XndBGQmX6kUHQ2h86anQ49Oe40yuKxqv
-y1FP3IRKe/0B+cDLYA7/OAgqVTgKnqmG7PabejdUAmfYZkbkyxA/Mdz/jVp1Pu3P
-FZb9maoUKCBibQGRbfwHeq28LusguOjQOPFZNGhCrWtU0MNMbO4yXvm1qS+eKvxB
-ytvvY1ixAH/jNUFAi22Lu+ghz9Byd1NfCnRDZrpBk637EXwuglxG2yoUkH2FhRRY
-FBM5P65AFEoUE4wqFqqKpiBTtjSx7grPaPUZWBzzXCHNkUARgwdxfZbeOzL7OLg5
-j9AJZZjAoOOV3q8Cv/71
-=WAV7
+iQIcBAEBCAAGBQJU2t52AAoJEPZTWjO6HuSNI6kQAK2owA5/KY/0FZy0m5Gs/twr
+cl6+gmiAnAMNK7fI9pUvoeX/ejHUxC18J825rhZEtuyufeDvwWUNSvfbUI4sDvnQ
+VWMwcli1N8uyPR4TBSj4wSZJL4Pi8n9qIJ6A4bRxGd+X4LGyeTXNNIG6xENZWo8U
+er7O/wtXvZq5BidsZkO5KelEBHqwPJn+uyq6uezY91CIzRBMtwAJwa0dL1e7SVfG
++pTd95uMwhBqBHGhMiV8lB2RRJlPedzlT0/t2NbwxXx/qVzRI5blMQkRm5g+Jyjt
+vtQ3Qu5nMykfXwTkM6r0PXpqkc6Ab5Jsn/Tsp8YQE7N0tHNNOPcFtIowP8H71sU8
+bnA/kVcQufkQ2Gc9Uas9W4jH5WJyhP0tlXs/vOsADU8FQPEPWQQ/5Uv1Z0qsKWDY
+EhzXE3s/VMiC+pDaswTr/3FGPU97BnFwObeYodmOil1+8XuPE/1asn2kzeOGmYTA
+P4J9gelw7fIVPGcFVdlPjXNWm+cXC6S/p6DuPg9eAHyIZvAcO39i3nccMKlthlfF
+j539EcmXZk1jSjhXstKqgxezRaxtWi8VGTI+F9MCk7ZQYPlIubKGas2/TfaoDuRW
+khbW/FACab5GwzWFR+/yK2bWz3KAsPk0UiVJnOkPsRc+YSF2fLqwI9aed9J3tXBb
+w8TrTRt7l94o3XXeLLnB
+=GlWs
 -----END PGP SIGNATURE-----
diff --git a/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch b/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch
new file mode 100644
index 000000000000..1300d923eb7d
--- /dev/null
+++ b/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch
@@ -0,0 +1,32 @@
+--- opensm-3.3.17/configure.in.orig	2014-01-30 23:13:35.000000000 +0400
++++ opensm-3.3.17/configure.in	2014-12-27 02:48:11.264876067 +0300
+@@ -17,11 +17,7 @@
+                    [name of the RDMA service: "rdma" when using /etc/init.d/rdma to start RDMA services; "openibd" when using /etc/init.d/openibd to start RDMA services [default=${default_rdma_service}]]))
+ AC_SUBST(RDMA_SERVICE, ${with_rdma_service:-${default_rdma_service}})
+ 
+-if { rpm -q sles-release || rpm -q openSUSE-release; } >/dev/null 2>&1; then
+-   default_stop="0 1 4 6"
+-else
+-   default_stop="0 1 6"
+-fi
++default_stop="0 1 6"
+ 
+ default_start="null"
+ 
+@@ -282,4 +278,4 @@
+ AC_CONFIG_FILES([man/opensm.8 man/torus-2QoS.8 man/torus-2QoS.conf.5 scripts/opensm.init scripts/redhat-opensm.init scripts/sldd.sh])
+ 
+ dnl Create the following Makefiles
+-AC_OUTPUT([include/opensm/osm_version.h Makefile include/Makefile complib/Makefile libvendor/Makefile opensm/Makefile osmeventplugin/Makefile osmtest/Makefile opensm.spec])
++AC_OUTPUT([include/opensm/osm_version.h Makefile include/Makefile complib/Makefile libvendor/Makefile opensm/Makefile osmeventplugin/Makefile osmtest/Makefile])
+--- opensm-3.3.17/Makefile.am.orig	2013-02-07 11:46:28.000000000 +0400
++++ opensm-3.3.17/Makefile.am	2014-12-27 02:48:45.133654187 +0300
+@@ -19,7 +19,7 @@
+ 	doc/partition-config.txt doc/opensm-sriov.txt \
+ 	doc/opensm_release_notes-3.3.txt
+ 
+-EXTRA_DIST = autogen.sh opensm.spec $(various_scripts) $(man_MANS) $(docs)
++EXTRA_DIST = autogen.sh $(various_scripts) $(man_MANS) $(docs)
+ 
+ dist-hook: $(EXTRA_DIST)
+ 	if [ -x $(top_srcdir)/gen_chlog.sh ] ; then \
diff --git a/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch b/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch
new file mode 100644
index 000000000000..d7eb3ec24b9b
--- /dev/null
+++ b/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch
@@ -0,0 +1,20 @@
+--- opensm-3.3.17/scripts/sldd.sh.in.orig	2013-02-07 11:46:29.000000000 +0400
++++ opensm-3.3.17/scripts/sldd.sh.in	2014-12-27 04:47:24.488636743 +0300
+@@ -42,7 +42,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ 
+-CONFIG=@sysconfdir@/sysconfig/opensm
++CONFIG=@sysconfdir@/conf.d/sldd
+ if [ -f $CONFIG ]; then
+ 	. $CONFIG
+ fi
+@@ -57,7 +57,7 @@
+ 
+ RCP=${RCP:-/usr/bin/scp}
+ RSH=${RSH:-/usr/bin/ssh}
+-IFCONFIG=${IFCONFIG:-'/sbin/ifconfig -a'}
++IFCONFIG=${IFCONFIG:-'/bin/ifconfig -a'}
+ 
+ declare -i SLDD_DEBUG
+ RESCAN_TIME=${RESCAN_TIME:-60}
diff --git a/sys-infiniband/opensm/files/opensm.conf.d b/sys-infiniband/opensm/files/opensm.conf.d
new file mode 100644
index 000000000000..4f0cd49a4bc5
--- /dev/null
+++ b/sys-infiniband/opensm/files/opensm.conf.d
@@ -0,0 +1,3 @@
+# Provide OpenSM options here.
+# See man opensm for details
+OSM_OPTIONS=""
diff --git a/sys-infiniband/opensm/files/opensm.init.d b/sys-infiniband/opensm/files/opensm.init.d
index a01cdd084d15..6b4b78b450aa 100644
--- a/sys-infiniband/opensm/files/opensm.init.d
+++ b/sys-infiniband/opensm/files/opensm.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d,v 1.2 2012/04/18 16:45:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d,v 1.3 2015/02/11 04:45:41 bircoph Exp $
 
 depend() {
     need openib
@@ -12,7 +12,7 @@ prog=/usr/sbin/opensm
 
 start() {
     ebegin "Starting OpenSM Infiniband Subnet Manager"
-    start-stop-daemon --start --background --exec $prog -- $OPTIONS
+    start-stop-daemon --start --background --exec $prog -- $OSM_OPTIONS
     eend $?
 }
 
diff --git a/sys-infiniband/opensm/files/sldd.conf.d b/sys-infiniband/opensm/files/sldd.conf.d
new file mode 100644
index 000000000000..ee0e88750310
--- /dev/null
+++ b/sys-infiniband/opensm/files/sldd.conf.d
@@ -0,0 +1,21 @@
+# Tho following variables will used for sldd.sh
+#
+# You must setup this for sldd to work
+OSM_HOSTS=""
+
+### Optional variables (defaults are commented out)
+
+# Debug level
+#SLDD_DEBUG="0"
+
+# OpenSM cache files
+#CACHE_FILE="/var/cache/opensm/guid2lid:/var/cache/opensm/guid2mkey:/var/cache/opensm/neighbors"
+
+# System calls
+#PING="ping -w 1 -c 1"
+#RCP="/usr/bin/scp"
+#SSH="/usr/bin/ssh"
+#IFCONFIG="/bin/ifconfig -a"
+
+# Delay between hosts scan
+#RESCAN_TIME="60"
diff --git a/sys-infiniband/opensm/files/sldd.init.d b/sys-infiniband/opensm/files/sldd.init.d
new file mode 100644
index 000000000000..fa9fbff0f617
--- /dev/null
+++ b/sys-infiniband/opensm/files/sldd.init.d
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/sldd.init.d,v 1.1 2015/02/11 04:45:41 bircoph Exp $
+
+depend() {
+    need opensm
+    after net    # ip net seems to be needed to perform management.
+}
+
+prog=/usr/sbin/sldd.sh
+pidfile=/var/run/sldd.pid
+
+start() {
+    ebegin "Starting Semi-static LID OpenSM Distribution Manager"
+    start-stop-daemon --start --background --pidfile "${pidfile}" \
+        --make-pidfile --wait 500 --exec $prog
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping OpenSM Infiniband Subnet Manager"
+    start-stop-daemon --stop --pidfile "${pidfile}"
+    eend $?
+}
+
diff --git a/sys-infiniband/opensm/metadata.xml b/sys-infiniband/opensm/metadata.xml
index 82f7df3d4706..eb4ecb9d802f 100644
--- a/sys-infiniband/opensm/metadata.xml
+++ b/sys-infiniband/opensm/metadata.xml
@@ -7,4 +7,7 @@ OpenSM provides an implementation for an InfiniBand Subnet Manager and
 Administrator. Such a software entity is required to run for in order to
 initialize the InfiniBand hardware (at least one per each InfiniBand subnet).
 </longdescription>
+<use>
+	<flag name="tools">Install ssld extra tool</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-infiniband/opensm/opensm-3.3.17.ebuild b/sys-infiniband/opensm/opensm-3.3.17-r1.ebuild
index 489ec6f2588d..7f93744afdcb 100644
--- a/sys-infiniband/opensm/opensm-3.3.17.ebuild
+++ b/sys-infiniband/opensm/opensm-3.3.17-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/opensm-3.3.17.ebuild,v 1.1 2014/04/16 08:22:28 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/opensm-3.3.17-r1.ebuild,v 1.1 2015/02/11 04:45:41 bircoph Exp $
 
 EAPI="5"
 
@@ -9,19 +9,28 @@ OFED_RC="1"
 OFED_RC_VER="1"
 OFED_SUFFIX="1"
 
-inherit openib
+inherit autotools eutils openib
 
 DESCRIPTION="OpenSM - InfiniBand Subnet Manager and Administration for OpenIB"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
+IUSE="tools"
 
 DEPEND="
 	sys-infiniband/libibmad:${SLOT}
 	sys-infiniband/libibumad:${SLOT}"
 RDEPEND="$DEPEND
-	 net-misc/iputils"
+	 tools? (
+		net-misc/iputils
+		net-misc/openssh
+	)"
 block_other_ofed_versions
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-norpm.patch"
+	epatch "${FILESDIR}/${P}-sldd.patch"
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--enable-perf-mgr \
@@ -31,12 +40,18 @@ src_configure() {
 
 src_install() {
 	default
-	newconfd "${S}/scripts/opensm.sysconfig" opensm
+	newconfd "${FILESDIR}/opensm.conf.d" opensm
 	newinitd "${FILESDIR}/opensm.init.d" opensm
 	insinto /etc/logrotate.d
 	newins "${S}/scripts/opensm.logrotate" opensm
 	# we dont nee this int script
 	rm "${ED}/etc/init.d/opensmd" || die "Dropping of upstream initscript failed"
+
+	if use tools; then
+		dosbin scripts/sldd.sh
+		newconfd "${FILESDIR}/sldd.conf.d" sldd
+		newinitd "${FILESDIR}/sldd.init.d" sldd
+	fi
 }
 
 pkg_postinst() {