Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-doc_html_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
|
||||
$NetBSD: patch-doc_html_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- doc/html/Makefile.am.orig 2012-03-16 22:14:30.000000000 +0000
|
||||
--- doc/html/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ doc/html/Makefile.am
|
||||
@@ -1,6 +1,3 @@
|
||||
-
|
||||
-htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
|
||||
-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
|
||||
-
|
||||
generated_html = \
|
||||
accounting.html \
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
$NetBSD: patch-doc_html_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
|
||||
$NetBSD: patch-doc_html_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- doc/html/Makefile.in.orig 2012-03-16 22:14:30.000000000 +0000
|
||||
--- doc/html/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ doc/html/Makefile.in
|
||||
@@ -282,7 +282,7 @@ host_alias = @host_alias@
|
||||
@@ -341,7 +341,7 @@ host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
-htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
|
||||
-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
|
||||
+htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
$NetBSD: patch-doc_man_man1_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
|
||||
$NetBSD: patch-doc_man_man1_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- doc/man/man1/Makefile.am.orig 2012-03-16 22:14:30.000000000 +0000
|
||||
--- doc/man/man1/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ doc/man/man1/Makefile.am
|
||||
@@ -1,5 +1,3 @@
|
||||
-htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
|
||||
-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
|
||||
-
|
||||
man1_MANS = \
|
||||
sacct.1 \
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
$NetBSD: patch-doc_man_man1_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
|
||||
$NetBSD: patch-doc_man_man1_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- doc/man/man1/Makefile.in.orig 2012-03-16 22:14:30.000000000 +0000
|
||||
--- doc/man/man1/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ doc/man/man1/Makefile.in
|
||||
@@ -284,7 +284,7 @@ host_alias = @host_alias@
|
||||
@@ -343,7 +343,7 @@ host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
-htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
|
||||
-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
|
||||
+htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-doc_man_man5_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
|
||||
$NetBSD: patch-doc_man_man5_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- doc/man/man5/Makefile.am.orig 2012-03-16 22:14:30.000000000 +0000
|
||||
--- doc/man/man5/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ doc/man/man5/Makefile.am
|
||||
@@ -1,5 +1,3 @@
|
||||
-htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
|
||||
-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
|
||||
-
|
||||
man5_MANS = bluegene.conf.5 \
|
||||
cgroup.conf.5 \
|
||||
cray.conf.5 \
|
||||
man5_MANS = \
|
||||
acct_gather.conf.5 \
|
||||
bluegene.conf.5 \
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
$NetBSD: patch-doc_man_man5_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
|
||||
$NetBSD: patch-doc_man_man5_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- doc/man/man5/Makefile.in.orig 2012-03-16 22:14:30.000000000 +0000
|
||||
--- doc/man/man5/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ doc/man/man5/Makefile.in
|
||||
@@ -284,7 +284,7 @@ host_alias = @host_alias@
|
||||
@@ -343,7 +343,7 @@ host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
-htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
|
||||
-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
|
||||
+htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
$NetBSD: patch-doc_man_man8_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
|
||||
$NetBSD: patch-doc_man_man8_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- doc/man/man8/Makefile.am.orig 2012-03-16 22:14:30.000000000 +0000
|
||||
--- doc/man/man8/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ doc/man/man8/Makefile.am
|
||||
@@ -1,5 +1,3 @@
|
||||
-htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
|
||||
-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
|
||||
-
|
||||
man8_MANS = slurmctld.8 \
|
||||
slurmd.8 \
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
$NetBSD: patch-doc_man_man8_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
|
||||
$NetBSD: patch-doc_man_man8_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- doc/man/man8/Makefile.in.orig 2012-03-16 22:14:30.000000000 +0000
|
||||
--- doc/man/man8/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ doc/man/man8/Makefile.in
|
||||
@@ -284,7 +284,7 @@ host_alias = @host_alias@
|
||||
@@ -343,7 +343,7 @@ host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
-htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
|
||||
-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
|
||||
+htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
|
||||
22
parallel/slurm/patches/patch-src_common_net.c
Normal file
22
parallel/slurm/patches/patch-src_common_net.c
Normal file
@@ -0,0 +1,22 @@
|
||||
$NetBSD: patch-src_common_net.c,v 1.1 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- src/common/net.c.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ src/common/net.c
|
||||
@@ -52,7 +52,7 @@
|
||||
#include <errno.h>
|
||||
#include <stdint.h>
|
||||
|
||||
-#if defined(__FreeBSD__)
|
||||
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
#define SOL_TCP IPPROTO_TCP
|
||||
#endif
|
||||
|
||||
@@ -216,7 +216,7 @@ extern int net_set_keep_alive(int sock)
|
||||
* Removing this call might decrease the robustness of communications,
|
||||
* but will probably have no noticable effect.
|
||||
*/
|
||||
-#if ! defined(__FreeBSD__) || (__FreeBSD_version > 900000)
|
||||
+#if (! defined(__FreeBSD__) || (__FreeBSD_version > 900000)) && ! defined(__APPLE__)
|
||||
opt_int = keep_alive_time;
|
||||
if (setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &opt_int, opt_len) < 0) {
|
||||
error("Unable to set keep alive socket time: %m");
|
||||
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-src_common_slurm__jobacct__gather.c,v 1.1 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- src/common/slurm_jobacct_gather.c.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ src/common/slurm_jobacct_gather.c
|
||||
@@ -47,7 +47,7 @@
|
||||
* Morris Jette, et al.
|
||||
\*****************************************************************************/
|
||||
|
||||
-#if defined(__FreeBSD__)
|
||||
+#if defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
#include <signal.h>
|
||||
#endif
|
||||
#include <pthread.h>
|
||||
13
parallel/slurm/patches/patch-src_common_xcgroup.c
Normal file
13
parallel/slurm/patches/patch-src_common_xcgroup.c
Normal file
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-src_common_xcgroup.c,v 1.1 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- src/common/xcgroup.c.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ src/common/xcgroup.c
|
||||
@@ -217,7 +217,7 @@ int xcgroup_ns_mount(xcgroup_ns_t* cgns)
|
||||
options = opt_combined;
|
||||
}
|
||||
|
||||
-#if defined(__FreeBSD__)
|
||||
+#if defined(__FreeBSD__) || defined(__APPLE__)
|
||||
if (mount("cgroup", cgns->mnt_point,
|
||||
MS_NOSUID|MS_NOEXEC|MS_NODEV, options))
|
||||
#else
|
||||
13
parallel/slurm/patches/patch-src_common_xcgroup.h
Normal file
13
parallel/slurm/patches/patch-src_common_xcgroup.h
Normal file
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-src_common_xcgroup.h,v 1.1 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- src/common/xcgroup.h.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ src/common/xcgroup.h
|
||||
@@ -49,7 +49,7 @@
|
||||
#define XCGROUP_SUCCESS 0
|
||||
|
||||
// http://lists.debian.org/debian-boot/2012/04/msg00047.html
|
||||
-#if defined(__FreeBSD__)
|
||||
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
#define MS_NOSUID MNT_NOSUID
|
||||
#define MS_NOEXEC MNT_NOEXEC
|
||||
#define MS_NODEV 0
|
||||
@@ -0,0 +1,14 @@
|
||||
$NetBSD: patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c,v 1.2 2014/03/19 22:05:39 asau Exp $
|
||||
|
||||
--- src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c.orig 2013-12-23 19:38:25.000000000 +0000
|
||||
+++ src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c
|
||||
@@ -49,6 +49,9 @@
|
||||
#include <getopt.h>
|
||||
#include <netinet/in.h>
|
||||
|
||||
+#if defined(__NetBSD__) || defined(__FreeBSD__)
|
||||
+#include <limits.h> /* PATH_MAX */
|
||||
+#endif
|
||||
|
||||
#include "src/common/slurm_xlator.h"
|
||||
#include "src/common/slurm_acct_gather_filesystem.h"
|
||||
13
parallel/slurm/patches/patch-src_slurmctld_reservation.c
Normal file
13
parallel/slurm/patches/patch-src_slurmctld_reservation.c
Normal file
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-src_slurmctld_reservation.c,v 1.1 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- src/slurmctld/reservation.c.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ src/slurmctld/reservation.c
|
||||
@@ -44,7 +44,7 @@
|
||||
# include <pthread.h>
|
||||
#endif /* WITH_PTHREADS */
|
||||
|
||||
-#if defined(__FreeBSD__)
|
||||
+#if defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
#include <signal.h>
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-src_slurmd_common_setproctitle.c,v 1.1 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- src/slurmd/common/setproctitle.c.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ src/slurmd/common/setproctitle.c
|
||||
@@ -90,7 +90,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#endif
|
||||
-#if defined(__FreeBSD__)
|
||||
+#if defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
#include <stdio.h>
|
||||
#endif
|
||||
#ifndef HAVE_SETPROCTITLE
|
||||
18
parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c
Normal file
18
parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c
Normal file
@@ -0,0 +1,18 @@
|
||||
$NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.1 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- src/slurmd/slurmstepd/task.c.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ src/slurmd/slurmstepd/task.c
|
||||
@@ -501,7 +501,12 @@ _make_tmpdir(slurmd_job_t *job)
|
||||
* still work with older systems we include this check.
|
||||
*/
|
||||
|
||||
-#if defined(__FreeBSD__)
|
||||
+/* FIXME: Come up with a real solution for EUID instead of substituting RUID */
|
||||
+#if defined(__NetBSD__)
|
||||
+#define eaccess(p,m) (access((p),(m)))
|
||||
+#endif
|
||||
+
|
||||
+#if defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
#define __GLIBC__ (1)
|
||||
#define __GLIBC_PREREQ(a,b) (1)
|
||||
#endif
|
||||
13
parallel/slurm/patches/patch-src_srun_libsrun_debugger.c
Normal file
13
parallel/slurm/patches/patch-src_srun_libsrun_debugger.c
Normal file
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-src_srun_libsrun_debugger.c,v 1.1 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- src/srun/libsrun/debugger.c.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ src/srun/libsrun/debugger.c
|
||||
@@ -38,7 +38,7 @@
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
\*****************************************************************************/
|
||||
|
||||
-#if defined(__FreeBSD__)
|
||||
+#if defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
#include <signal.h>
|
||||
#endif
|
||||
|
||||
13
parallel/slurm/patches/patch-src_srun_libsrun_launch.c
Normal file
13
parallel/slurm/patches/patch-src_srun_libsrun_launch.c
Normal file
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-src_srun_libsrun_launch.c,v 1.1 2013/12/06 06:05:30 asau Exp $
|
||||
|
||||
--- src/srun/libsrun/launch.c.orig 2013-11-04 21:19:15.000000000 +0000
|
||||
+++ src/srun/libsrun/launch.c
|
||||
@@ -36,7 +36,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
-#if defined(__FreeBSD__)
|
||||
+#if defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
#include <signal.h>
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user