Package list ibutils / 0b93592
Patch as RedHat and use /var/cache/ibutils for the output of the diagnostic tools instead of /tmp. CVE-2013-2561. (Closes: #704063) Ana Guerrero López 7 years ago
4 changed file(s) with 506 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
44 - Add build depend on dpkg-dev (>= 1.16.0).
55 - Update debian/rules to find multiarch tk-lib.
66 Thanks to Sergei Golovan. (Closes: #724998)
7 * Patch as RedHat and use /var/cache/ibutils for the output of the
8 diagnostic tools instead of /tmp. CVE-2013-2561. (Closes: #704063)
79 * Sync with upstream. They have released two new versions with the same
810 version number but adding two commits. Add patches with these commits:
911 git-05a9d1a.patch and git-bd7e502.patch.
00 usr/bin
1 var/cache/ibutils
0 --- a/ibdiag/demo/sm-single-master.tcl
1 +++ b/ibdiag/demo/sm-single-master.tcl
2 @@ -132,7 +132,7 @@ proc checker {simDir osmPath osmPortGuid
3 gets stdin
4 puts " h. Make one of teh SMs sweep: kill -HUP %2."
5 puts " Now one of the SMs gets to standby mode"
6 - puts " i. Run ibdiagnet again to see the info about the SMs in /tmp/ibdiagnet.sm"
7 + puts " i. Run ibdiagnet again to see the info about the SMs in /var/cache/ibutils/ibdiagnet.sm"
8 puts " "
9 puts " press Enter when done"
10 gets stdin
11 --- a/ibdiag/doc/ibdiag_release_notes.txt
12 +++ b/ibdiag/doc/ibdiag_release_notes.txt
13 @@ -61,7 +61,7 @@ Other changes:
14
15 + Load subnet database from file:
16 Ibdiagnet dumps its internal database, which contains the subnet structure,
17 - to a file (/tmp/ibdiagnet.db by default). This file can be loaded in later
18 + to a file (/var/cache/ibutils/ibdiagnet.db by default). This file can be loaded in later
19 ibdiagnet runs (using the -load_db <db file> option). When this option is set,
20 ibdiagnet loads the subnet data from the file and skips the discovery stage.
21 Using this option can save the subnet discovery time for large cluster.
22 @@ -221,11 +221,11 @@ Software dependency:
23 ===============================================================================
24 3. Reports
25 ===============================================================================
26 -The default directory for all generated report files is /tmp .
27 +The default directory for all generated report files is /var/cache/ibutils .
28
29 Both utilities collect summary information regarding all the fabric SM's
30 during the run, and then output that information at end of the run in file
31 -/tmp/ibdiagnet.sm.
32 +/var/cache/ibutils/ibdiagnet.sm.
33
34 Each report message includes:
35 - Device Type
36 --- a/ibdiag/doc/ibdiagnet.pod
37 +++ b/ibdiag/doc/ibdiagnet.pod
38 @@ -195,7 +195,7 @@ Specifies the local device's port num us
39 =over
40
41 =item
42 -Specifies the directory where the output files will be placed (default = /tmp)
43 +Specifies the directory where the output files will be placed (default = /var/cache/ibutils)
44
45 =back
46
47 @@ -260,7 +260,7 @@ Skip options (one or more can be specifi
48
49 =item
50 Write out the discovered topology into the given file. This flag is useful if you later want to check for changes from the current state of the fabric.
51 -A directory named ibdiag_ibnl is also created by this option, and holds the IBNL files required to load this topology. To use these files you will need to set the environment variable named IBDM_IBNL_PATH to that directory. The directory is located in /tmp or in the output directory provided by the -o flag.
52 +A directory named ibdiag_ibnl is also created by this option, and holds the IBNL files required to load this topology. To use these files you will need to set the environment variable named IBDM_IBNL_PATH to that directory. The directory is located in /var/cache/ibutils or in the output directory provided by the -o flag.
53
54 =back
55
56 --- a/ibdiag/doc/ibdiagnet.txt
57 +++ b/ibdiag/doc/ibdiagnet.txt
58 @@ -48,7 +48,7 @@ OPTIONS
59 -p <port-num> : Specifies the local device's port number used to connect to
60 the IB fabric
61 -o <out-dir> : Specifies the directory where the output files will be placed
62 - (default = /tmp/ez)
63 + (default = /var/cache/ibutils)
64
65 -h|--help : Prints this help information
66 -V|--version : Prints the version of the tool
67 --- a/ibdiag/doc/ibdiagpath.pod
68 +++ b/ibdiag/doc/ibdiagpath.pod
69 @@ -135,7 +135,8 @@ Specifies the local device's port number
70 =over
71
72 =item
73 -Specifies the directory where the output files will be placed (default = /tmp)
74 +Specifies the directory where the output files will be placed (default =
75 +/var/cache/ibutils)
76
77 =back
78
79 --- a/ibdiag/src/ibdebug_if.tcl
80 +++ b/ibdiag/src/ibdebug_if.tcl
81 @@ -170,7 +170,7 @@ proc SetInfoArgv {} {
82 -n,error "-E-argv:bad.node.name"
83
84 -o,name "out.dir"
85 - -o,default "/tmp"
86 + -o,default "/var/cache/ibutils"
87 -o,param "out-dir"
88 -o,desc "Specifies the directory where the output files will be placed"
89
90 --- a/ibdiag/src/ibdiagui.tcl
91 +++ b/ibdiag/src/ibdiagui.tcl
92 @@ -2141,7 +2141,7 @@ proc DiagNet {} {
93 close $f
94 set lstFile [file join $testModeDir ibdiagnet.lst]
95 } else {
96 - set lstFile /tmp/ibdiagnet.lst
97 + set lstFile /var/cache/ibutils/ibdiagnet.lst
98 set r ""
99 LogAppend "-I-Invoking ibdiagnet ...."
100 # puts "-I- Invoking ibdiagnet ...."
101 --- a/ibdm/doc/ibdmchk.1
102 +++ b/ibdm/doc/ibdmchk.1
103 @@ -186,7 +186,7 @@ Use enhanced routing algorithm when \s-1
104 .IX Item "-r|--roots <roots file> A file with all the roots node names (one on each line)."
105 .SH "VERIFICATION MODE DESCRIPTION"
106 .IX Header "VERIFICATION MODE DESCRIPTION"
107 -After the cluster is built and OpenSM is run (using flag \-D 0x43) it reports the subnet and \s-1FDB\s0 tables into the files osm\-subnet.lst, osm.fdbs and osm.fdbs in /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /tmp in older OpenSM versions). ibdiagnet is also producing the same files in its output directory.
108 +After the cluster is built and OpenSM is run (using flag \-D 0x43) it reports the subnet and \s-1FDB\s0 tables into the files osm\-subnet.lst, osm.fdbs and osm.fdbs in /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /var/cache/ibutils in older OpenSM versions). ibdiagnet is also producing the same files in its output directory.
109 Based on these files the utility checks all \s-1CA\s0 to \s-1CA\s0 connectivity. Further analysis for credit deadlock potential is performed and reported.
110 In case of an \s-1LMC\s0 > 0 it reports histograms for how many systems and nodes are common between the different paths for the same port pairs.
111 .SH "ARGUMENTS"
112 @@ -208,15 +208,15 @@ Provides this help message
113 .RE
114 .IP "\-s|\-\-subnet <file>"
115 .IX Item "-s|--subnet <file>"
116 -OpenSM subnet.lst file (default is /var/log/osm\-subnet.lst or /tmp/subnet.lst)
117 +OpenSM subnet.lst file (default is /var/log/osm\-subnet.lst or /var/cache/ibutils/subnet.lst)
118 .RE
119 .IP "\-f|\-\-fdb <file>"
120 .IX Item "-f|--fdb <file>"
121 -OpenSM dump of Ucast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.fdbs or /tmp/osm.fdbs).
122 +OpenSM dump of Ucast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.fdbs or /var/cache/ibutils/osm.fdbs).
123 .RE
124 .IP "\-m|\-\-mcfdb <file>"
125 .IX Item "-m|--mcfdb <file>"
126 -OpenSM dump of Multicast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.mcfdbs or /tmp/osm.mcfdbs).
127 +OpenSM dump of Multicast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.mcfdbs or /var/cache/ibutils/osm.mcfdbs).
128 .RE
129 .IP "\-c|\-\-psl <file>"
130 .IX Item "-c|--psl <file>"
131 --- a/ibdm/doc/ibdmchk.pod
132 +++ b/ibdm/doc/ibdmchk.pod
133 @@ -59,7 +59,7 @@ A file with all the roots node names (on
134
135 =head1 VERIFICATION MODE DESCRIPTION
136
137 -After the cluster is built and OpenSM is run (using flag -D 0x43) it reports the subnet and FDB tables into the files osm-subnet.lst, osm.fdbs and osm.fdbs in /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /tmp in older OpenSM versions). ibdiagnet is also producing the same files in its output directory.
138 +After the cluster is built and OpenSM is run (using flag -D 0x43) it reports the subnet and FDB tables into the files osm-subnet.lst, osm.fdbs and osm.fdbs in /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /var/cache/ibutils in older OpenSM versions). ibdiagnet is also producing the same files in its output directory.
139 Based on these files the utility checks all CA to CA connectivity. Further analysis for credit deadlock potential is performed and reported.
140 In case of an LMC > 0 it reports histograms for how many systems and nodes are common between the different paths for the same port pairs.
141
142 @@ -81,15 +81,15 @@ Provides this help message
143
144 =item -s|--subnet <file>
145
146 -OpenSM subnet.lst file (default is /var/log/osm-subnet.lst or /tmp/subnet.lst)
147 +OpenSM subnet.lst file (default is /var/log/osm-subnet.lst or /var/cache/ibutils/subnet.lst)
148
149 =item -f|--fdb <file>
150
151 -OpenSM dump of Ucast LFDB. Use -D 0x41 to generate it (default is /var/log/osm.fdbs or /tmp/osm.fdbs).
152 +OpenSM dump of Ucast LFDB. Use -D 0x41 to generate it (default is /var/log/osm.fdbs or /var/cache/ibutils/osm.fdbs).
153
154 =item -m|--mcfdb <file>
155
156 -OpenSM dump of Multicast LFDB. Use -D 0x41 to generate it (default is /var/log/osm.mcfdbs or /tmp/osm.mcfdbs).
157 +OpenSM dump of Multicast LFDB. Use -D 0x41 to generate it (default is /var/log/osm.mcfdbs or /var/cache/ibutils/osm.mcfdbs).
158
159 =item -c|--psl <file>
160
161 --- a/ibdm/ibdm/LinkCover.cpp
162 +++ b/ibdm/ibdm/LinkCover.cpp
163 @@ -302,7 +302,7 @@ dumpLinearProgram(IBFabric *p_fabric,
164 set< string > vars;
165 int numLinks = 0;
166 IBNode *p_node;
167 - ofstream linProgram("/tmp/ibdmchk.lp");
168 + ofstream linProgram("/var/cache/ibutils/ibdmchk.lp");
169
170 // we need a doubel path - first collect all in ports and
171 // dump out the target - maximize number of links covered
172 @@ -890,8 +890,8 @@ LinkCoverageAnalysis(IBFabric *p_fabric,
173 // iteration only.
174 map_pnode_p_sint outPortUsedMap;
175 cout << "-I- Generating non blocking full link coverage plan into:"
176 - << "/tmp/ibdmchk.non_block_all_links" << endl;
177 - ofstream linkProgram("/tmp/ibdmchk.non_block_all_links");
178 + << "/var/cache/ibutils/ibdmchk.non_block_all_links" << endl;
179 + ofstream linkProgram("/var/cache/ibutils/ibdmchk.non_block_all_links");
180
181 // initialize the data structures
182 if (initFdbForwardPortLidTables(
183 --- a/ibdm/ibdm/SubnMgt.cpp
184 +++ b/ibdm/ibdm/SubnMgt.cpp
185 @@ -1104,7 +1104,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p
186 #if DO_CA_TO_CA_NUM_PATHS_HIST
187 // report the link over subscription histogram and dump out the
188 // num paths per switch out port
189 - ofstream linkUsage("/tmp/ibdmchk.sw_out_port_num_paths");
190 + ofstream linkUsage("/var/cache/ibutils/ibdmchk.sw_out_port_num_paths");
191 linkUsage << "# NUM-PATHS PORT-NAME " << endl;
192 vec_int linkSubscriptionHist(maxLinkSubscriptions + 1,0);
193 for (map_pnode_vec_int::iterator nI = switchPathsPerOutPort.begin();
194 @@ -1127,7 +1127,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p
195 cout << "all the CA to CA paths. Ports driving CAs are ignored (as they must" << endl;
196 cout << "have = Nca - 1). If the fabric is routed correctly the histogram" << endl;
197 cout << "should be narrow for all ports on same level of the tree." << endl;
198 - cout << "A detailed report is provided in /tmp/ibdmchk.sw_out_port_num_paths.\n" << endl;
199 + cout << "A detailed report is provided in /var/cache/ibutils/ibdmchk.sw_out_port_num_paths.\n" << endl;
200 cout << "NUM-PATHS NUM-SWITCH-PORTS" << endl;
201 for (int b = 0; b <= maxLinkSubscriptions; b++)
202 if (linkSubscriptionHist[b])
203 @@ -1136,7 +1136,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p
204 #endif
205
206 // now do the DLID per out port:
207 - ofstream portDlidsUsage("/tmp/ibdmchk.sw_out_port_num_dlids");
208 + ofstream portDlidsUsage("/var/cache/ibutils/ibdmchk.sw_out_port_num_dlids");
209 portDlidsUsage << "# NUM-DLIDS PORT-NAME " << endl;
210 vec_int dlidsSubscriptionHist(maxDlidPerOutPort + 1,0);
211 for (map_pnode_vec_int::iterator nI = switchDLidsPerOutPort.begin();
212 @@ -1159,7 +1159,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p
213 cout << "all the CA to CA paths. Ports driving CAs are ignored (as they must" << endl;
214 cout << "have = Nca - 1). If the fabric is routed correctly the histogram" << endl;
215 cout << "should be narrow for all ports on same level of the tree." << endl;
216 - cout << "A detailed report is provided in /tmp/ibdmchk.sw_out_port_num_dlids.\n" << endl;
217 + cout << "A detailed report is provided in /var/cache/ibutils/ibdmchk.sw_out_port_num_dlids.\n" << endl;
218 cout << "NUM-DLIDS NUM-SWITCH-PORTS" << endl;
219 for (int b = 0; b <= maxDlidPerOutPort; b++)
220 if (dlidsSubscriptionHist[b])
221 --- a/ibdm/src/lst2ibnl
222 +++ b/ibdm/src/lst2ibnl
223 @@ -70,8 +70,8 @@ DESCRIPTION
224 ARGUMENTS (required)
225 -l <lst file>
226 Input fabric link listing file as generated by OpenSM
227 - (/tmp/subnet.lst or /var/log/osm.lst depending on the version) or
228 - ibdiagnet (/tmp/ibdiagnet.lst)
229 + (/var/cache/ibutils/subnet.lst or /var/log/osm.lst depending on the version) or
230 + ibdiagnet (/var/cache/ibutils/ibdiagnet.lst)
231
232 -p <port-name>
233 The name of the switch system front panel port connected to the
234 @@ -96,8 +96,8 @@ EXAMPLE
235
236 0. Make sure the file Gnu.lst does not exist
237 1. Connect an HCA in machine we call "host" to FPP L1/P1
238 - 2. Run ibdiagnet on the "host" machine (will create /tmp/ibdiagnet.lst)
239 - 3. Run lst2ibnl -l /tmp/ibdiagnet.lst -s Gnu -p L1/P1
240 + 2. Run ibdiagnet on the "host" machine (will create /var/cache/ibutils/ibdiagnet.lst)
241 + 3. Run lst2ibnl -l /var/cache/ibutils/ibdiagnet.lst -s Gnu -p L1/P1
242 4. Perform steps 1..3 by connecting the "host" to each one of the
243 front panel ports and providing its name on the subsequent call to
244 lst2ibnl
245 --- a/ibdm/src/osm_check.cpp
246 +++ b/ibdm/src/osm_check.cpp
247 @@ -86,7 +86,7 @@ show_help() {
248 << " Description:\n"
249 << " After the cluster is built and OpenSM is run (using flag -D 0x43) it reports the\n"
250 << " subnet and FDB tables into the files osm-subnet.lst, osm.fdbs and osm.fdbs in\n"
251 - << " /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /tmp in older versions).\n"
252 + << " /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /var/cache/ibutils in older versions).\n"
253 << " If more than one SL is known to be used additional file holding CAxCA->SL mapping \n"
254 << " is generated (format: 0xsrc_guid dlid sl) . In this case the SL2VL mapping is \n"
255 << " optionally supplied in an additional file (format: 0xsw_guid inport outport 0x(sl0)(sl1),\n"
256 @@ -102,11 +102,11 @@ show_help() {
257 << " Options:\n"
258 << " -v|--verbose = verbose mode\n"
259 << " -h|--help = provide this help message\n"
260 - << " -s|--subnet <file> = OpenSM subnet.lst file (/var/log/osm-subnet.lst or /tmp/subnet.lst)\n"
261 + << " -s|--subnet <file> = OpenSM subnet.lst file (/var/log/osm-subnet.lst or /var/cache/ibutils/subnet.lst)\n"
262 << " -f|--fdb <file> = OpenSM dump of Ucast LFDB. Use -D 0x41 to generate it.\n"
263 - << " (default is /var/log/osm.fdbs or /tmp/osm.fdbs).\n"
264 + << " (default is /var/log/osm.fdbs or /var/cache/ibutils/osm.fdbs).\n"
265 << " -m|--mcfdb <file> = OpenSM dump of Multicast LFDB. Use -D 0x41 to generate it.\n"
266 - << " (default is /var/log/osm.mcfdbs or /tmp/osm.mcfdbs).\n"
267 + << " (default is /var/log/osm.mcfdbs or /var/cache/ibutils/osm.mcfdbs).\n"
268 << " -c|--psl <file> = CAxCA->SL mapping. Each line holds: srcguid dlid sl \n"
269 << " -d|--slvl <file> = SL2VL mapping. Each line holds: swguid iport oport 0x(sl0)(sl1) 0x(sl2)(sl3)...\n"
270 << " -r|--roots <roots file> = a file holding all root nodes guids (one per line).\n"
271 @@ -465,20 +465,20 @@ int main (int argc, char **argv) {
272 if (fdbFile.size() == 0) {
273 if (access("/var/log/osm.fdbs",R_OK) == 0)
274 fdbFile = string("/var/log/osm.fdbs");
275 - else if (access("/tmp/osm.fdbs",R_OK) == 0)
276 - fdbFile = string("/tmp/osm.fdbs");
277 + else if (access("/var/cache/ibutils/osm.fdbs",R_OK) == 0)
278 + fdbFile = string("/var/cache/ibutils/osm.fdbs");
279 else {
280 - cout << "-E- Could not find a readble osm.fdbs in /var/log or /tmp" << endl;
281 + cout << "-E- Could not find a readble osm.fdbs in /var/log or /var/cache/ibutils" << endl;
282 anyMissingFile = 1;
283 }
284 }
285 if (mcFdbFile.size() == 0) {
286 if (access("/var/log/osm.mcfdbs",R_OK) == 0)
287 mcFdbFile = string("/var/log/osm.mcfdbs");
288 - else if (access("/tmp/osm.mcfdbs",R_OK) == 0)
289 - mcFdbFile = string("/tmp/osm.mcfdbs");
290 + else if (access("/var/cache/ibutils/osm.mcfdbs",R_OK) == 0)
291 + mcFdbFile = string("/var/cache/ibutils/osm.mcfdbs");
292 else {
293 - cout << "-E- Could not find a readble osm.mcfdbs in /var/log or /tmp" << endl;
294 + cout << "-E- Could not find a readble osm.mcfdbs in /var/log or /var/cache/ibutils" << endl;
295 anyMissingFile = 1;
296 }
297 }
298 @@ -486,10 +486,10 @@ int main (int argc, char **argv) {
299 if (subnetFile.size() == 0) {
300 if (access("/var/log/osm-subnet.lst",R_OK) == 0)
301 subnetFile = string("/var/log/osm-subnet.lst");
302 - else if (access("/tmp/subnet.lst",R_OK) == 0)
303 - subnetFile = string("/tmp/subnet.lst");
304 + else if (access("/var/cache/ibutils/subnet.lst",R_OK) == 0)
305 + subnetFile = string("/var/cache/ibutils/subnet.lst");
306 else {
307 - cout << "-E- Could not find a readble /var/log/osm-subnet.lst or /tmp/subnet.lst" << endl;
308 + cout << "-E- Could not find a readble /var/log/osm-subnet.lst or /var/cache/ibutils/subnet.lst" << endl;
309 anyMissingFile = 1;
310 }
311 }
312 @@ -587,7 +587,7 @@ int main (int argc, char **argv) {
313 // rank the fabric by these roots
314 map_pnode_int nodesRank;
315 SubnRankFabricNodesByRootNodes(&fabric, rootNodes, nodesRank);
316 - ofstream rankFile("/tmp/ibdmchk.node_ranking");
317 + ofstream rankFile("/var/cache/ibutils/ibdmchk.node_ranking");
318 rankFile << "-I- Node Ranking:" << endl;
319 for(map_pnode_int::iterator nI = nodesRank.begin();
320 nI != nodesRank.end(); nI++)
321 --- a/ibis/src/ibis.i
322 +++ b/ibis/src/ibis.i
323 @@ -564,7 +564,7 @@ extern char * ibisSourceVersion;
324 IbisOpts.m_key = 0;
325 IbisOpts.v_key = 0;
326 IbisOpts.log_flags = OSM_LOG_ERROR;
327 - strcpy(IbisOpts.log_file,"/tmp/ibis.log");
328 + strcpy(IbisOpts.log_file,"/var/cache/ibutils/ibis.log");
329
330
331 /* we want all exists to cleanup */
332 --- a/ibis/src/ibis_wrap.c
333 +++ b/ibis/src/ibis_wrap.c
334 @@ -75067,7 +75067,7 @@ SWIGEXPORT(int,Ibis_Init)(Tcl_Interp *in
335 IbisOpts.m_key = 0;
336 IbisOpts.v_key = 0;
337 IbisOpts.log_flags = OSM_LOG_ERROR;
338 - strcpy(IbisOpts.log_file,"/tmp/ibis.log");
339 + strcpy(IbisOpts.log_file,"/var/cache/ibutils/ibis.log");
340
341
342 /* we want all exists to cleanup */
343 --- a/ibis/src/ibissh_wrap.cpp
344 +++ b/ibis/src/ibissh_wrap.cpp
345 @@ -75129,7 +75129,7 @@ SWIGEXPORT(int,Ibis_Init)(Tcl_Interp *in
346 IbisOpts.m_key = 0;
347 IbisOpts.v_key = 0;
348 IbisOpts.log_flags = OSM_LOG_ERROR;
349 - strcpy(IbisOpts.log_file,"/tmp/ibis.log");
350 + strcpy(IbisOpts.log_file,"/var/cache/ibutils/ibis.log");
351
352
353 /* we want all exists to cleanup */
354 --- a/ibis/tests/ibcr_test.tcl
355 +++ b/ibis/tests/ibcr_test.tcl
356 @@ -132,7 +132,7 @@ set badLid [lindex $argv 3]
357 #
358 package require ibis
359 ibis_set_verbosity 0xff
360 -ibis_opts configure -log_file /tmp/ibcr_test.log
361 +ibis_opts configure -log_file /var/cache/ibutils/ibcr_test.log
362 ibis_init
363
364 set availPorts [ibis_get_local_ports_info]
365 --- a/ibmgtsim/doc/IBMgtSim.1
366 +++ b/ibmgtsim/doc/IBMgtSim.1
367 @@ -158,7 +158,7 @@ A tcl file to be sourced after the fabri
368 .RE
369 .IP "\-l log-file"
370 .IX Item "-l log-file"
371 -Set the log file of the simulator (default is /tmp/ibsim.log)
372 +Set the log file of the simulator (default is /var/cache/ibutils/ibsim.log)
373 .RE
374 .IP "\-p server-port"
375 .IX Item "-p server-port"
376 --- a/ibmgtsim/doc/IBMgtSim.pod
377 +++ b/ibmgtsim/doc/IBMgtSim.pod
378 @@ -30,7 +30,7 @@ A tcl file to be sourced after the fabri
379
380 =item -l log-file
381
382 -Set the log file of the simulator (default is /tmp/ibsim.log)
383 +Set the log file of the simulator (default is /var/cache/ibutils/ibsim.log)
384
385 =item -p server-port
386
387 --- a/ibmgtsim/src/client.cpp
388 +++ b/ibmgtsim/src/client.cpp
389 @@ -158,7 +158,7 @@ __ibms_get_sim_host_n_port(char *hostNam
390 if (getenv("IBMGTSIM_DIR"))
391 simDir = getenv("IBMGTSIM_DIR");
392 else
393 - simDir = "/tmp/ibmgtsim";
394 + simDir = "/var/cache/ibutils/ibmgtsim";
395
396 std::string serverFileName = simDir + "/ibmgtsim.server";
397
398 --- a/ibmgtsim/src/sim.cpp
399 +++ b/ibmgtsim/src/sim.cpp
400 @@ -50,8 +50,8 @@ const char *IBMgtSim::getSimulatorDir()
401 if (!getenv("IBMGTSIM_DIR")) {
402 printf("-W- Environment variable: IBMGTSIM_DIR does not exist.\n");
403 printf(" Please create one used by the simulator.\n");
404 - printf(" Using /tmp/ibmgtsim as default.\n");
405 - return "/tmp/ibmgtsim";
406 + printf(" Using /var/cache/ibutils/ibmgtsim as default.\n");
407 + return "/var/cache/ibutils/ibmgtsim";
408 }
409 return getenv("IBMGTSIM_DIR");
410 }
411 --- a/ibmgtsim/tests/FatTree.check.tcl
412 +++ b/ibmgtsim/tests/FatTree.check.tcl
413 @@ -44,7 +44,7 @@ proc runner {simDir osmPath osmPortGuid}
414 puts "-I- Starting: $osmPath -R ftree -d2 -V -g $osmPortGuid ..."
415 #set osmPid [exec $osmPath -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
416 set osmPid [exec $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
417 - #set osmPid [exec valgrind --tool=memcheck -v --log-file-exactly=/tmp/kliteyn/osm.valgrind.log $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
418 + #set osmPid [exec valgrind --tool=memcheck -v --log-file-exactly=/var/cache/ibutils/osm.valgrind.log $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
419
420 # start a tracker on the log file and process:
421 startOsmLogAnalyzer $osmLog
422 --- a/ibmgtsim/tests/FatTreeFails.check.tcl
423 +++ b/ibmgtsim/tests/FatTreeFails.check.tcl
424 @@ -44,7 +44,7 @@ proc runner {simDir osmPath osmPortGuid}
425 puts "-I- Starting: $osmPath -R ftree -d2 -V -g $osmPortGuid ..."
426 #set osmPid [exec $osmPath -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
427 set osmPid [exec $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
428 - #set osmPid [exec valgrind --tool=memcheck -v --log-file-exactly=/tmp/kliteyn/osm.valgrind.log $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
429 + #set osmPid [exec valgrind --tool=memcheck -v --log-file-exactly=/var/cache/ibutils/osm.valgrind.log $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
430
431 # start a tracker on the log file and process:
432 startOsmLogAnalyzer $osmLog
433 --- a/ibmgtsim/tests/init.test.tcl
434 +++ b/ibmgtsim/tests/init.test.tcl
435 @@ -30,7 +30,7 @@
436 # SOFTWARE.
437 #--
438
439 -MsgMgr setLogFile "/tmp/sim.log"
440 +MsgMgr setLogFile "/var/cache/ibutils/sim.log"
441 MsgMgr setVerbLevel $MsgShowAll
442 IBMgtSimulator init /home/eitan/SW/cvsroot/IBADM/ibdm/Clusters/RhinoBased512.topo 46517 5
443 puts [IBMgtSimulator getFabric]
444 @@ -42,7 +42,7 @@ puts [IBMSNode_getPhyPortPMCounter simno
445 set mcm [madMcMemberRec]
446 madMcMemberRec_send_set $mcm simnode:1:SL2-2/spine1/U2 1 1 0
447
448 -MsgMgr setLogFile "/tmp/sim.log"
449 +MsgMgr setLogFile "/var/cache/ibutils/sim.log"
450 MsgMgr setVerbLevel $MsgShowAll
451 IBMgtSimulator init /home/eitan/SW/cvsroot/IBADM/ibdm/Clusters/FullGnu.topo 46517 5
452 source /home/eitan/SW/SVN/osm/branches/main2_0/osm/test/osmMulticastRoutingTest.sim.tcl
453 @@ -60,7 +60,7 @@ proc activateNodePorts {node} {
454 }
455 }
456
457 -MsgMgr setLogFile "/tmp/sim.log"
458 +MsgMgr setLogFile "/var/cache/ibutils/sim.log"
459 MsgMgr setVerbLevel $MsgShowAll
460 IBMgtSimulator init /usr/share/ibmgtsim/Gnu16NodeOsmTest.topo 46517 1
461 set f [IBMgtSimulator getFabric]
462 @@ -72,7 +72,7 @@ foreach nodeNameNPtr [IBFabric_NodeByNam
463 activateNodePorts [lindex $nodeNameNPtr 1]
464 }
465
466 -MsgMgr setLogFile "/tmp/sim.log"
467 +MsgMgr setLogFile "/var/cache/ibutils/sim.log"
468 MsgMgr setVerbLevel $MsgShowAll
469 IBMgtSimulator init test.topo 46517 1
470 set f [IBMgtSimulator getFabric]
471 --- a/ibmgtsim/utils/IBMgtSim
472 +++ b/ibmgtsim/utils/IBMgtSim
473 @@ -73,7 +73,7 @@ proc Help {} {
474 Command Line Options:
475 -s seed = the seed to be used for random number generation.
476 -f flow-tcl-file = a tcl file to be sourced after the fabric is setup.
477 - -l log-file = set the log file of the simulator (default is /tmp/ibsim.log)
478 + -l log-file = set the log file of the simulator (default is /var/cache/ibutils/ibsim.log)
479 -p server-port = set the port number the server attaches to (default 46517)
480 -w num-threads = the number of threads processing the mads
481 -V <module-verbosity-pair-list> = Provides a fine grain control over
482 @@ -375,7 +375,7 @@ proc getopt { argslist optstring optret
483 #
484
485 set moduleVerbosityList {top 0xA7}
486 -set logFileName /tmp/ibsim.log
487 +set logFileName /var/cache/ibutils/ibsim.log
488 set numWorkerThreads 1
489 set serverPortNum 46517
490 set simulationFlowFile ""
491 --- a/ibmgtsim/utils/RunSimTest
492 +++ b/ibmgtsim/utils/RunSimTest
493 @@ -775,7 +775,7 @@ rmSeed $randomSeed
494 set osmTrackerPipes {}
495
496 # define tmp directory to use:
497 -set tmpDir /tmp
498 +set tmpDir /var/cache/ibutils
499
500 # Define the temporary directory:
501 set simDir [file join $tmpDir ibmgtsim.$pid]
22 03-remove-rpath.patch
33 git-05a9d1a.patch
44 git-bd7e502.patch
5 do_not_use_tmp.patch