Import patches from slurm pkg

[Jason Bacon <bacon4000%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Sun May 15 21:54:24 2016 -0500
Changeset:	c3f5a11af9de0a6b60d32f90e568966aa01de72e

Modified Files:
	slurm-devel/distinfo
	slurm-devel/patches/patch-etc_init.d.slurm.in
	slurm-devel/patches/patch-src_plugins_switch_generic_switch__generic.c
	slurm-devel/patches/patch-src_slurmd_slurmstepd_task.c

Log Message:
Import patches from slurm pkg

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c3f5a11af9de0a6b60d32f90e568966aa01de72e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 slurm-devel/distinfo                                           | 10 +++++-----
 slurm-devel/patches/patch-etc_init.d.slurm.in                  |  1 +
 .../patches/patch-src_plugins_switch_generic_switch__generic.c |  1 +
 slurm-devel/patches/patch-src_slurmd_slurmstepd_task.c         |  1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diffs:
diff --git a/slurm-devel/distinfo b/slurm-devel/distinfo
index 5a0cdef..24e6a4c 100644
--- a/slurm-devel/distinfo
+++ b/slurm-devel/distinfo
@@ -4,10 +4,10 @@ SHA1 (slurm-16.05.0-0rc1.tar.bz2) = 72b6372aab7ff1df57c52db22b91b32f5daab5eb
 RMD160 (slurm-16.05.0-0rc1.tar.bz2) = e76cb4d68ff45330a57846564ff5ad39a160c623
 SHA512 (slurm-16.05.0-0rc1.tar.bz2) = c8ad323d942805c7f0b843e961958e3a2057e28a334466640cc58ccf184033bf64ebeba3f3cb994c7f6133a51a4f32c6d73905def0a299f1e8333ad4fc4eadff
 Size (slurm-16.05.0-0rc1.tar.bz2) = 5993402 bytes
-SHA1 (patch-etc_init.d.slurm.in) = f29d2c603b8d62df80aec4ac77f2e9bc218f55fc
-SHA1 (patch-src_common_callerid.c) = 5b8f75e8bfa51c3f5edff7a8398190df719453c9
-SHA1 (patch-src_common_gres.c) = 0bee6fa5fcec6285a5c42d318c26590e1f0c7951
+SHA1 (patch-etc_init.d.slurm.in) = 0c779048fad16cb2de4abbe078a967a99fe0321f
+SHA1 (patch-src_common_callerid.c) = caea5b2d428435285ec66f00624fcac812d1b141
+SHA1 (patch-src_common_gres.c) = 0f2d7cce6dd6063f98894f08f6cdbaa3a09d856e
 SHA1 (patch-src_plugins_burst__buffer_common_burst__buffer__common.c) = 64739577cc3567601eb4a9531554b6d9468f6210
 SHA1 (patch-src_plugins_power_common_power__common.c) = e95ea1a3825fbe68d44e571174ef2eddd0040a7b
-SHA1 (patch-src_plugins_switch_generic_switch__generic.c) = b91f4cbb253a1c93c83edc8e5f0d2b4606f96735
-SHA1 (patch-src_slurmd_slurmstepd_task.c) = 9d0a2384655301c0f00e2c291a767d9f4f4d0102
+SHA1 (patch-src_plugins_switch_generic_switch__generic.c) = 877ace2fbc2f7d6747438ac0c32a6b5b902fd70f
+SHA1 (patch-src_slurmd_slurmstepd_task.c) = bb02a932efdd38369b08513cb0ec9d5ebe3cdd6f
diff --git a/slurm-devel/patches/patch-etc_init.d.slurm.in b/slurm-devel/patches/patch-etc_init.d.slurm.in
index 81a7f49..f3bd66c 100644
--- a/slurm-devel/patches/patch-etc_init.d.slurm.in
+++ b/slurm-devel/patches/patch-etc_init.d.slurm.in
@@ -1,5 +1,6 @@
 $NetBSD: patch-etc_init.d.slurm.in,v 1.1 2015/04/20 13:08:37 outpaddling Exp $
 
+# Provide something for SUBST to replace
 --- etc/init.d.slurm.in.orig	2015-03-19 19:38:01.000000000 +0000
 +++ etc/init.d.slurm.in
 @@ -25,6 +25,9 @@
diff --git a/slurm-devel/patches/patch-src_plugins_switch_generic_switch__generic.c b/slurm-devel/patches/patch-src_plugins_switch_generic_switch__generic.c
index 3efc5e7..7a8d8ab 100644
--- a/slurm-devel/patches/patch-src_plugins_switch_generic_switch__generic.c
+++ b/slurm-devel/patches/patch-src_plugins_switch_generic_switch__generic.c
@@ -1,5 +1,6 @@
 $NetBSD: patch-src_plugins_switch_generic_switch__generic.c,v 1.1 2015/04/20 13:08:37 outpaddling Exp $
 
+# Ensure proper #include order
 --- src/plugins/switch/generic/switch_generic.c.orig	2015-03-19 19:38:01.000000000 +0000
 +++ src/plugins/switch/generic/switch_generic.c
 @@ -40,12 +40,13 @@
diff --git a/slurm-devel/patches/patch-src_slurmd_slurmstepd_task.c b/slurm-devel/patches/patch-src_slurmd_slurmstepd_task.c
index 768c385..56ee3f8 100644
--- a/slurm-devel/patches/patch-src_slurmd_slurmstepd_task.c
+++ b/slurm-devel/patches/patch-src_slurmd_slurmstepd_task.c
@@ -1,5 +1,6 @@
 $NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.2 2015/04/20 13:08:37 outpaddling Exp $
 
+# Hack for Linux compat
 --- src/slurmd/slurmstepd/task.c.orig	2015-03-19 19:38:01.000000000 +0000
 +++ src/slurmd/slurmstepd/task.c
 @@ -540,6 +540,17 @@ _make_tmpdir(stepd_step_rec_t *job)