slurm: Upgrade to 15.08.12 and patch task/affinity

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

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Sun Jun 12 09:43:29 2016 -0500
Changeset:	d0c8fca46419f222e4d05f83a86005e90b6cd38a

Modified Files:
	slurm/Makefile
	slurm/distinfo
	slurm/patches/patch-etc_init.d.slurm.in
	slurm/patches/patch-src_common_gres.c
Removed Files:
	slurm/patches/patch-src_common_callerid.c
	slurm/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c
	slurm/patches/patch-src_plugins_power_common_power__common.c
	slurm/patches/patch-src_plugins_switch_generic_switch__generic.c
	slurm/patches/patch-src_slurmd_slurmstepd_task.c

Log Message:
slurm: Upgrade to 15.08.12 and patch task/affinity

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

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

diffstat:
 slurm/Makefile                                     |  2 +-
 slurm/distinfo                                     | 17 +++-----
 slurm/patches/patch-etc_init.d.slurm.in            | 35 ++++++++++++---
 slurm/patches/patch-src_common_callerid.c          | 21 ---------
 slurm/patches/patch-src_common_gres.c              | 50 +++++-----------------
 ...ns_burst__buffer_common_burst__buffer__common.c | 15 -------
 .../patch-src_plugins_power_common_power__common.c | 15 -------
 ...ch-src_plugins_switch_generic_switch__generic.c | 23 ----------
 slurm/patches/patch-src_slurmd_slurmstepd_task.c   | 25 -----------
 9 files changed, 45 insertions(+), 158 deletions(-)

diffs:
diff --git a/slurm/Makefile b/slurm/Makefile
index 59f0f2c..66c53e2 100644
--- a/slurm/Makefile
+++ b/slurm/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.8 2015/04/29 12:40:50 outpaddling Exp $
 
-DISTNAME=	slurm-15.08.11
+DISTNAME=	slurm-15.08.12
 CATEGORIES=	parallel
 MASTER_SITES=	http://www.schedmd.com/download/archive/ \
 		http://www.schedmd.com/download/latest/ \
diff --git a/slurm/distinfo b/slurm/distinfo
index 35ebf07..7886d46 100644
--- a/slurm/distinfo
+++ b/slurm/distinfo
@@ -1,13 +1,8 @@
 $NetBSD: distinfo,v 1.3 2015/04/29 12:40:50 outpaddling Exp $
 
-SHA1 (slurm-15.08.11.tar.bz2) = 1a69b8e44c3c40ee5403874e3c3a66fc476f62c8
-RMD160 (slurm-15.08.11.tar.bz2) = 73100156c355ac2a05a70efcf00b949276438b77
-SHA512 (slurm-15.08.11.tar.bz2) = f152893fc1c8f54120d886c81d1651545c79cc67606608b871d2c5a7e6c396deb59a7573a61e2a73fd9b9742e3ac5d53ab4db69b8b1e6a533a26b02e5e733b33
-Size (slurm-15.08.11.tar.bz2) = 5870156 bytes
-SHA1 (patch-etc_init.d.slurm.in) = beaedd5385b4aad04583d2bc5a23557519f74ec5
-SHA1 (patch-src_common_callerid.c) = a6d743542f2c46d17a94b2473be703be41c24664
-SHA1 (patch-src_common_gres.c) = 9f8ba8fd5a8c4000da5bca67ee7d3ff529e37e99
-SHA1 (patch-src_plugins_burst__buffer_common_burst__buffer__common.c) = b21a852722c26b955ae51d8615c9d22304650d32
-SHA1 (patch-src_plugins_power_common_power__common.c) = 7527e0655efe6ea0243cb3a9ff21814002bed5d9
-SHA1 (patch-src_plugins_switch_generic_switch__generic.c) = acf9bcc6f8a787770cd8553de520edef5bdbda4a
-SHA1 (patch-src_slurmd_slurmstepd_task.c) = 7948c76ce65b0e5211486d2e7b1901664c1f7016
+SHA1 (slurm-15.08.12.tar.bz2) = 491b48a0395616d0cbcc8672f84285e5ee3a7e7f
+RMD160 (slurm-15.08.12.tar.bz2) = 6e3f336b947dd0936e8c23c6b4f180fc66899af3
+SHA512 (slurm-15.08.12.tar.bz2) = f9ff1654b90d5e6be20339eb68c503979286baffff229053d0a1d63e71c625ca85dcbc51dd79ccd1617d3644390fc66e9619fada8f7201388d2a312c29d3a7d1
+Size (slurm-15.08.12.tar.bz2) = 5805740 bytes
+SHA1 (patch-etc_init.d.slurm.in) = df8e6d578e5b525fccdb5468f875dafb95fc2f86
+SHA1 (patch-src_common_gres.c) = 913be598274884b453922e18cdb88eb43a2ef13f
diff --git a/slurm/patches/patch-etc_init.d.slurm.in b/slurm/patches/patch-etc_init.d.slurm.in
index a5a61fc..10f521e 100644
--- a/slurm/patches/patch-etc_init.d.slurm.in
+++ b/slurm/patches/patch-etc_init.d.slurm.in
@@ -2,15 +2,36 @@ $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.orig	2016-05-31 21:35:09.000000000 +0000
 +++ etc/init.d.slurm.in
-@@ -25,6 +25,9 @@
+@@ -5,10 +5,10 @@
+ #              manages exclusive access to a set of compute \
+ #              resources and distributes work to those resources.
+ #
+-# processname: @sbindir@/slurmd
++# processname: ${exec_prefix}/sbin/slurmd
+ # pidfile: /var/run/slurmd.pid
+ #
+-# processname: @sbindir@/slurmctld
++# processname: ${exec_prefix}/sbin/slurmctld
+ # pidfile: /var/run/slurmctld.pid
+ #
+ # config: /etc/sysconfig/slurm
+@@ -25,10 +25,13 @@
  # Description:       Start slurm to provide resource management
  ### END INIT INFO
  
-+exec_prefix=
-+prefix=
+-BINDIR="@bindir@"
+-CONFDIR="@sysconfdir@"
+-LIBDIR="@libdir@"
+-SBINDIR="@sbindir@"
++exec_prefix=/home/bacon/Pkgsrc/pkg-2016Q1
++prefix=/home/bacon/Pkgsrc/pkg-2016Q1
 +
- BINDIR="@bindir@"
- CONFDIR="@sysconfdir@"
- LIBDIR="@libdir@"
++BINDIR="${exec_prefix}/bin"
++CONFDIR="${prefix}/etc"
++LIBDIR="${exec_prefix}/lib"
++SBINDIR="${exec_prefix}/sbin"
+ 
+ # On a bluegene system this will be set to '#'.
+ # Yes, FALSE is the correct variable to look at in the .in script.
diff --git a/slurm/patches/patch-src_common_callerid.c b/slurm/patches/patch-src_common_callerid.c
deleted file mode 100644
index b71a125..0000000
--- a/slurm/patches/patch-src_common_callerid.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-# Hack to allow access to opaque structure members
-
---- src/common/callerid.c.orig	2016-05-03 22:41:59.000000000 +0000
-+++ src/common/callerid.c
-@@ -58,6 +58,14 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#endif
-+
-+/*
-+ * FIXME: In in6.h, s6_addr32 def is guarded by #ifdef _KERNEL
-+ * Is there a portable interface that could be used instead of accessing
-+ * structure members directly?
-+ */
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #define s6_addr32 __u6_addr.__u6_addr32
- #endif
- 
diff --git a/slurm/patches/patch-src_common_gres.c b/slurm/patches/patch-src_common_gres.c
index 84965df..8d72862 100644
--- a/slurm/patches/patch-src_common_gres.c
+++ b/slurm/patches/patch-src_common_gres.c
@@ -1,44 +1,14 @@
 $NetBSD$
 
-# CPU sets are not (yet) standardized across platforms.
-
---- src/common/gres.c.orig	2016-05-03 22:41:59.000000000 +0000
+--- src/common/gres.c.orig	2016-05-31 21:35:09.000000000 +0000
 +++ src/common/gres.c
-@@ -79,6 +79,14 @@ typedef cpuset_t cpu_set_t;
- #include <sys/stat.h>
- #include <math.h>
- 
-+// Linux compat layer for _get_usable_gres()
-+#ifdef __NetBSD__
-+#define CPU_ZERO(c) cpuset_zero(*(c))
-+#define CPU_ISSET(i,c) cpuset_isset((i),*(c))
-+#define sched_getaffinity sched_getaffinity_np
-+#define SCHED_GETAFFINITY_THREE_ARGS
-+#endif
-+
- #include "slurm/slurm.h"
- #include "slurm/slurm_errno.h"
- #include "src/common/bitstring.h"
-@@ -5591,7 +5599,12 @@ extern uint64_t gres_plugin_step_count(L
-  * which are available from the CPUs current allocated to this process */
- static bitstr_t * _get_usable_gres(int context_inx)
- {
-+#ifdef __NetBSD__
-+	// On NetBSD, cpuset_t is an opaque data type
-+	cpuset_t *mask = cpuset_create();
-+#else
- 	cpu_set_t mask;
-+#endif
- 	bitstr_t *usable_gres = NULL;
- 	int i, i_last, rc;
- 	ListIterator iter;
-@@ -5641,6 +5654,9 @@ static bitstr_t * _get_usable_gres(int c
- 		gres_inx += gres_slurmd_conf->count;
- 	}
- 	list_iterator_destroy(iter);
-+#ifdef __NetBSD__
-+	cpuset_destroy(mask);
-+#endif
+@@ -82,7 +82,8 @@ typedef cpuset_t cpu_set_t;
+ #ifdef __NetBSD__
+ #define CPU_ZERO(c) cpuset_zero(*(c))
+ #define CPU_ISSET(i,c) cpuset_isset((i),*(c))
+-#define sched_getaffinity sched_getaffinity_np
++#define sched_getaffinity(p,s,c) \
++        sched_getaffinity_np((p),cpuset_size(*(c)),*(c))
+ #define SCHED_GETAFFINITY_THREE_ARGS
+ #endif
  
- 	return usable_gres;
- }
diff --git a/slurm/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c b/slurm/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c
deleted file mode 100644
index 719cd36..0000000
--- a/slurm/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-# Linux compat
-
---- src/plugins/burst_buffer/common/burst_buffer_common.c.orig	2016-05-14 18:55:22.000000000 +0000
-+++ src/plugins/burst_buffer/common/burst_buffer_common.c
-@@ -52,7 +52,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #define POLLRDHUP POLLHUP
- #include <signal.h>
- #endif
diff --git a/slurm/patches/patch-src_plugins_power_common_power__common.c b/slurm/patches/patch-src_plugins_power_common_power__common.c
deleted file mode 100644
index 5a55586..0000000
--- a/slurm/patches/patch-src_plugins_power_common_power__common.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-# Linux compat
-
---- ./src/plugins/power/common/power_common.c.orig	2016-05-03 22:35:12.000000000 +0000
-+++ ./src/plugins/power/common/power_common.c
-@@ -50,7 +50,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #define POLLRDHUP POLLHUP
- #include <signal.h>
- #endif
diff --git a/slurm/patches/patch-src_plugins_switch_generic_switch__generic.c b/slurm/patches/patch-src_plugins_switch_generic_switch__generic.c
deleted file mode 100644
index 6fcde48..0000000
--- a/slurm/patches/patch-src_plugins_switch_generic_switch__generic.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$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 @@
- #  include "config.h"
- #endif
- 
--#if !defined(__FreeBSD__)
--#include <net/if.h>
--#endif
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <sys/types.h>
-+/* net/if.h must come after sys/types.h on NetBSD */
-+#if !defined(__FreeBSD__)
-+#include <net/if.h>
-+#endif
- #include <sys/socket.h>
- #include <ifaddrs.h>
- #include <netdb.h>
diff --git a/slurm/patches/patch-src_slurmd_slurmstepd_task.c b/slurm/patches/patch-src_slurmd_slurmstepd_task.c
deleted file mode 100644
index 4681525..0000000
--- a/slurm/patches/patch-src_slurmd_slurmstepd_task.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-# Linux compat
-
---- src/slurmd/slurmstepd/task.c.orig	2016-05-03 22:41:59.000000000 +0000
-+++ src/slurmd/slurmstepd/task.c
-@@ -558,6 +558,18 @@ _make_tmpdir(stepd_step_rec_t *job)
- 		 * still work with older systems we include this check.
- 		 */
- 
-+/* FIXME: Come up with a real solution for EUID instead of substituting RUID */
-+#if defined(__NetBSD__)
-+#define eaccess(p,m) (access((p),(m)))
-+#define HAVE_EACCESS 1
-+#endif
-+  
-+// Unsure about the reason for this patch, but it dates back to SLURM 2.6.4
-+//#if defined(__FreeBSD__) || defined(__NetBSD__)
-+//#define __GLIBC__               (1) 
-+//#define __GLIBC_PREREQ(a,b)     (1) 
-+//#endif
-+
- #if defined(HAVE_FACCESSAT)
- 		else if (faccessat(AT_FDCWD, tmpdir, X_OK|W_OK, AT_EACCESS))
- #elif defined(HAVE_EACCESS)