slurm-devel:

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

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Wed Aug 10 10:00:53 2016 -0500
Changeset:	73d299327e793d8963ecfb0362c6217da922681c

Modified Files:
	slurm-devel/Makefile
	slurm-devel/distinfo
Removed Files:
	slurm-devel/patches/patch-src_common_callerid.c
	slurm-devel/patches/patch-src_common_gres.c
	slurm-devel/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c
	slurm-devel/patches/patch-src_plugins_power_common_power__common.c
	slurm-devel/patches/patch-src_plugins_switch_generic_switch__generic.c

Log Message:
slurm-devel:

Update to latest release.

Remove patches accepted upstream.

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

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

diffstat:
 slurm-devel/Makefile                               |  3 +-
 slurm-devel/distinfo                               |  8 ++--
 slurm-devel/patches/patch-src_common_callerid.c    | 21 -----------
 slurm-devel/patches/patch-src_common_gres.c        | 44 ----------------------
 ...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 -----------
 7 files changed, 5 insertions(+), 124 deletions(-)

diffs:
diff --git a/slurm-devel/Makefile b/slurm-devel/Makefile
index 2e6878a..efb3daf 100644
--- a/slurm-devel/Makefile
+++ b/slurm-devel/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.8 2015/04/29 12:40:50 outpaddling Exp $
 
-DISTNAME=	slurm-16.05.0-0rc2
-PKGNAME=	slurm-16.05.0
+DISTNAME=	slurm-16.05.3
 CATEGORIES=	parallel
 MASTER_SITES=	http://www.schedmd.com/download/archive/ \
 		http://www.schedmd.com/download/latest/ \
diff --git a/slurm-devel/distinfo b/slurm-devel/distinfo
index 9174a31..be67c57 100644
--- a/slurm-devel/distinfo
+++ b/slurm-devel/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.3 2015/04/29 12:40:50 outpaddling Exp $
 
-SHA1 (slurm-16.05.0-0rc2.tar.bz2) = 53a5b65c1ab5c5920c480257d534642c6e90fd74
-RMD160 (slurm-16.05.0-0rc2.tar.bz2) = 5c6610361862a6f987eb61878c1968e61a901d76
-SHA512 (slurm-16.05.0-0rc2.tar.bz2) = 5cc31ec8d04d6319849300a6e8cc19618c559a2debdfa8e29a979f8d7e7c0ee519f0a3beaaf4a639c8843a5b46a500093b2bd3e44324c50f25b8bb9f7e5e6946
-Size (slurm-16.05.0-0rc2.tar.bz2) = 5970434 bytes
+SHA1 (slurm-16.05.3.tar.bz2) = 035c3d5044dc498843ddde16cfc0e83e769e6d97
+RMD160 (slurm-16.05.3.tar.bz2) = 42d6ca3e87bd979345e751f71919aa2443d3207c
+SHA512 (slurm-16.05.3.tar.bz2) = 9da1d005f273ba418a5e96d154eb5680e7f2f9871661596cec2baf928bf432a088a6776dfcddda91287a784486cfbf4f6faff07d95c01b6e433551db92391ee2
+Size (slurm-16.05.3.tar.bz2) = 5989510 bytes
 SHA1 (patch-etc_init.d.slurm.in) = beaedd5385b4aad04583d2bc5a23557519f74ec5
 SHA1 (patch-src_common_callerid.c) = a6d743542f2c46d17a94b2473be703be41c24664
 SHA1 (patch-src_common_gres.c) = 9f8ba8fd5a8c4000da5bca67ee7d3ff529e37e99
diff --git a/slurm-devel/patches/patch-src_common_callerid.c b/slurm-devel/patches/patch-src_common_callerid.c
deleted file mode 100644
index b71a125..0000000
--- a/slurm-devel/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-devel/patches/patch-src_common_gres.c b/slurm-devel/patches/patch-src_common_gres.c
deleted file mode 100644
index 84965df..0000000
--- a/slurm-devel/patches/patch-src_common_gres.c
+++ /dev/null
@@ -1,44 +0,0 @@
-$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
-@@ -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
- 
- 	return usable_gres;
- }
diff --git a/slurm-devel/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c b/slurm-devel/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c
deleted file mode 100644
index 719cd36..0000000
--- a/slurm-devel/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-devel/patches/patch-src_plugins_power_common_power__common.c b/slurm-devel/patches/patch-src_plugins_power_common_power__common.c
deleted file mode 100644
index 5a55586..0000000
--- a/slurm-devel/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-devel/patches/patch-src_plugins_switch_generic_switch__generic.c b/slurm-devel/patches/patch-src_plugins_switch_generic_switch__generic.c
deleted file mode 100644
index 6fcde48..0000000
--- a/slurm-devel/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>