From owner-dev-commits-ports-main@freebsd.org Thu Jun 24 21:58:24 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D427B65519B; Thu, 24 Jun 2021 21:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G9vCN5XYJz4QyG; Thu, 24 Jun 2021 21:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A760C1F98C; Thu, 24 Jun 2021 21:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15OLwOLD019013; Thu, 24 Jun 2021 21:58:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15OLwODv019012; Thu, 24 Jun 2021 21:58:24 GMT (envelope-from git) Date: Thu, 24 Jun 2021 21:58:24 GMT Message-Id: <202106242158.15OLwODv019012@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason W. Bacon" Subject: git: 287eab190236 - main - sysutils/slurm-wlm: Update to 20.02.7 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jwb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 287eab190236e73e6455835fe15253fee62e3f42 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2021 21:58:24 -0000 The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=287eab190236e73e6455835fe15253fee62e3f42 commit 287eab190236e73e6455835fe15253fee62e3f42 Author: Jason W. Bacon AuthorDate: 2021-06-24 21:52:25 +0000 Commit: Jason W. Bacon CommitDate: 2021-06-24 21:52:25 +0000 sysutils/slurm-wlm: Update to 20.02.7 Add latest patch set (too numerous to cover, see RELEASE_NOTES in the dist) Remove upstreamed patches --- sysutils/slurm-wlm/Makefile | 4 +- sysutils/slurm-wlm/distinfo | 6 +- sysutils/slurm-wlm/files/patch-src_api_Makefile.in | 14 ++-- ...ch-src_plugins_proctrack_pgid_proctrack__pgid.c | 79 ---------------------- sysutils/slurm-wlm/pkg-plist | 7 ++ 5 files changed, 19 insertions(+), 91 deletions(-) diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile index 60ad0b5c88b1..866c70188966 100644 --- a/sysutils/slurm-wlm/Makefile +++ b/sysutils/slurm-wlm/Makefile @@ -1,6 +1,5 @@ PORTNAME= slurm -DISTVERSION= 20.02.1 -PORTREVISION= 6 +DISTVERSION= 20.02.7 CATEGORIES= sysutils python MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm @@ -22,6 +21,7 @@ LIB_DEPENDS= libjson-c.so:devel/json-c \ USES= compiler:c11 gmake gnome libtool localbase lua pkgconfig \ python:build readline shebangfix ssl tar:bz2 USE_LDCONFIG= yes +USE_PERL5= configure USE_RC_SUBR= slurmctld slurmd USERS= slurm diff --git a/sysutils/slurm-wlm/distinfo b/sysutils/slurm-wlm/distinfo index efa10eed45b1..fbbff46a6650 100644 --- a/sysutils/slurm-wlm/distinfo +++ b/sysutils/slurm-wlm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1585834999 -SHA256 (slurm-20.02.1.tar.bz2) = 7ee9813c6168292404785621d6a1c3c19d1b98c32d7dc750c408728061b011a5 -SIZE (slurm-20.02.1.tar.bz2) = 6302755 +TIMESTAMP = 1624569118 +SHA256 (slurm-20.02.7.tar.bz2) = 06865ff3cbf8bee1e75b12fa24c7d7a8fb0d4331f4c4a0d97c90058293d914ce +SIZE (slurm-20.02.7.tar.bz2) = 6562603 diff --git a/sysutils/slurm-wlm/files/patch-src_api_Makefile.in b/sysutils/slurm-wlm/files/patch-src_api_Makefile.in index 5757d1f40e63..955345040c2a 100644 --- a/sysutils/slurm-wlm/files/patch-src_api_Makefile.in +++ b/sysutils/slurm-wlm/files/patch-src_api_Makefile.in @@ -1,10 +1,10 @@ ---- src/api/Makefile.in.orig 2020-02-29 23:53:10 UTC +--- src/api/Makefile.in.orig 2021-05-12 20:23:20 UTC +++ src/api/Makefile.in -@@ -1300,7 +1300,6 @@ $(VERSION_SCRIPT) : - - $(FULL_VERSION_SCRIPT) : - (echo "{ global: *;"; \ +@@ -1306,7 +1306,6 @@ $(VERSION_SCRIPT) : + echo " slurmdb_*;"; \ + echo " plugin_context_*;"; \ + echo " working_cluster_rec;"; \ - echo " local: *;"; \ - echo "};") > $(FULL_VERSION_SCRIPT) + echo "};") > $(VERSION_SCRIPT) - # Tell versions [3.59,3.63) of GNU make to not export all variables. + $(FULL_VERSION_SCRIPT) : diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c b/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c deleted file mode 100644 index ed669163147c..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c +++ /dev/null @@ -1,79 +0,0 @@ ---- src/plugins/proctrack/pgid/proctrack_pgid.c.orig 2020-03-26 21:44:05 UTC -+++ src/plugins/proctrack/pgid/proctrack_pgid.c -@@ -49,6 +49,15 @@ - #include - #include - -+#ifdef __FreeBSD__ -+#include -+#include -+#include -+#include -+ -+#include /* must be last */ -+#endif -+ - #include "slurm/slurm.h" - #include "slurm/slurm_errno.h" - #include "src/common/log.h" -@@ -179,6 +188,55 @@ proctrack_p_wait(uint64_t cont_id) - return SLURM_SUCCESS; - } - -+ -+/* -+ * Get list of all PIDs belonging to process group cont_id -+ */ -+#ifdef __FreeBSD__ -+extern int proctrack_p_get_pids(uint64_t cont_id, pid_t **pids, int *npids) -+{ -+ pid_t *pid_array = NULL; -+ struct procstat *proc_info; -+ struct kinfo_proc *proc_list; -+ FILE *procstat_err; -+ unsigned int pid_count = 0; -+ -+ /* -+ * procstat_getprocs() prints an innocuous but annoying warning -+ * to stderr by default when no matching processes are found: -+ * -+ * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245318 -+ * -+ * Remove the redirect to /dev/null if this changes in the future. -+ */ -+ if ((procstat_err = fopen("/dev/null", "w+"))) -+ err_set_file(procstat_err); -+ proc_info = procstat_open_sysctl(); -+ proc_list = procstat_getprocs(proc_info, KERN_PROC_PGRP, cont_id, -+ (unsigned int *) &pid_count); -+ if (procstat_err) -+ { -+ err_set_file(NULL); -+ fclose(procstat_err); -+ } -+ -+ if (pid_count > 0) { -+ xrecalloc(pid_array, sizeof(pid_t), pid_count); -+ // FIXME: Do we need to filter zombies like the Linux code? -+ // proc_list[c].ki_paddr->p_state == PRS_ZOMBIE -+ for (size_t c = 0; c < pid_count; ++c) -+ pid_array[c] = proc_list[c].ki_pid; -+ } -+ -+ procstat_freeprocs(proc_info, proc_list); -+ procstat_close(proc_info); -+ -+ *pids = pid_array; -+ *npids = pid_count; -+ -+ return SLURM_SUCCESS; -+} -+#else - extern int - proctrack_p_get_pids(uint64_t cont_id, pid_t **pids, int *npids) - { -@@ -241,3 +299,4 @@ fini: *pids = pid_array; - *npids = pid_count; - return rc; - } -+#endif diff --git a/sysutils/slurm-wlm/pkg-plist b/sysutils/slurm-wlm/pkg-plist index 512763988ee4..465d65801fca 100644 --- a/sysutils/slurm-wlm/pkg-plist +++ b/sysutils/slurm-wlm/pkg-plist @@ -483,6 +483,12 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%/html/mpi_guide.html %%PORTDOCS%%%%DOCSDIR%%/html/mpiplugins.html %%PORTDOCS%%%%DOCSDIR%%/html/multi_cluster.html +%%PORTDOCS%%%%DOCSDIR%%/html/network.html +%%PORTDOCS%%%%DOCSDIR%%/html/network_failover.gif +%%PORTDOCS%%%%DOCSDIR%%/html/network_federation.gif +%%PORTDOCS%%%%DOCSDIR%%/html/network_multi_cluster.gif +%%PORTDOCS%%%%DOCSDIR%%/html/network_srun.gif +%%PORTDOCS%%%%DOCSDIR%%/html/network_standard.gif %%PORTDOCS%%%%DOCSDIR%%/html/news.html %%PORTDOCS%%%%DOCSDIR%%/html/node_features_plugins.html %%PORTDOCS%%%%DOCSDIR%%/html/nonstop.conf.html @@ -503,6 +509,7 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%/html/power_save.html %%PORTDOCS%%%%DOCSDIR%%/html/preempt.html %%PORTDOCS%%%%DOCSDIR%%/html/preemption_plugins.html +%%PORTDOCS%%%%DOCSDIR%%/html/prep_plugins.html %%PORTDOCS%%%%DOCSDIR%%/html/priority_multifactor.html %%PORTDOCS%%%%DOCSDIR%%/html/priority_multifactor3.html %%PORTDOCS%%%%DOCSDIR%%/html/priority_plugins.html