Date: Wed, 9 Jul 2014 09:23:49 +0000 (UTC) From: Dmitry Sivachenko <demon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361346 - head/devel/hadoop2/files Message-ID: <201407090923.s699NnAw089530@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: demon Date: Wed Jul 9 09:23:48 2014 New Revision: 361346 URL: http://svnweb.freebsd.org/changeset/ports/361346 QAT: https://qat.redports.org/buildarchive/r361346/ Log: Rename patch files to fit 100 characters to please portsnap. Added: head/devel/hadoop2/files/patch-hadoop-common-src-main-java-org-apache-hadoop-io-nativeio-SharedFileDescriptorFactory.java - copied unchanged from r361045, head/devel/hadoop2/files/patch-hadoop-common-project-hadoop-common-src-main-java-org-apache-hadoop-io-nativeio-SharedFileDescriptorFactory.java head/devel/hadoop2/files/patch-hadoop-common-src-main-native-src-org-apache-hadoop-security-hadoop_user_info.c - copied unchanged from r361045, head/devel/hadoop2/files/patch-hadoop-common-project-hadoop-common-src-main-native-src-org-apache-hadoop-security-hadoop_user_info.c head/devel/hadoop2/files/patch-hadoop-yarn-server-nodemanager-src-main-native-container-executor-impl-container-executor.c - copied unchanged from r361045, head/devel/hadoop2/files/patch-hadoop-yarn-project-hadoop-yarn-hadoop-yarn-server-hadoop-yarn-server-nodemanager-src-main-native-container-executor-impl-container-executor.c head/devel/hadoop2/files/patch-yarn-server-nodemanager-src-main-native-container-executor-test-test-container-executor.c - copied unchanged from r361045, head/devel/hadoop2/files/patch-hadoop-yarn-project-hadoop-yarn-hadoop-yarn-server-hadoop-yarn-server-nodemanager-src-main-native-container-executor-test-test-container-executor.c Deleted: head/devel/hadoop2/files/patch-hadoop-common-project-hadoop-common-src-main-java-org-apache-hadoop-io-nativeio-SharedFileDescriptorFactory.java head/devel/hadoop2/files/patch-hadoop-common-project-hadoop-common-src-main-native-src-org-apache-hadoop-security-hadoop_user_info.c head/devel/hadoop2/files/patch-hadoop-yarn-project-hadoop-yarn-hadoop-yarn-server-hadoop-yarn-server-nodemanager-src-main-native-container-executor-impl-container-executor.c head/devel/hadoop2/files/patch-hadoop-yarn-project-hadoop-yarn-hadoop-yarn-server-hadoop-yarn-server-nodemanager-src-main-native-container-executor-test-test-container-executor.c Copied: head/devel/hadoop2/files/patch-hadoop-common-src-main-java-org-apache-hadoop-io-nativeio-SharedFileDescriptorFactory.java (from r361045, head/devel/hadoop2/files/patch-hadoop-common-project-hadoop-common-src-main-java-org-apache-hadoop-io-nativeio-SharedFileDescriptorFactory.java) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/hadoop2/files/patch-hadoop-common-src-main-java-org-apache-hadoop-io-nativeio-SharedFileDescriptorFactory.java Wed Jul 9 09:23:48 2014 (r361346, copy of r361045, head/devel/hadoop2/files/patch-hadoop-common-project-hadoop-common-src-main-java-org-apache-hadoop-io-nativeio-SharedFileDescriptorFactory.java) @@ -0,0 +1,11 @@ +--- hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/SharedFileDescriptorFactory.java.orig 2014-06-21 09:40:10.000000000 +0400 ++++ hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/SharedFileDescriptorFactory.java 2014-07-04 13:49:25.000000000 +0400 +@@ -53,7 +53,7 @@ + if (!NativeIO.isAvailable()) { + return "NativeIO is not available."; + } +- if (!SystemUtils.IS_OS_UNIX) { ++ if (false) { + return "The OS is not UNIX."; + } + return null; Copied: head/devel/hadoop2/files/patch-hadoop-common-src-main-native-src-org-apache-hadoop-security-hadoop_user_info.c (from r361045, head/devel/hadoop2/files/patch-hadoop-common-project-hadoop-common-src-main-native-src-org-apache-hadoop-security-hadoop_user_info.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/hadoop2/files/patch-hadoop-common-src-main-native-src-org-apache-hadoop-security-hadoop_user_info.c Wed Jul 9 09:23:48 2014 (r361346, copy of r361045, head/devel/hadoop2/files/patch-hadoop-common-project-hadoop-common-src-main-native-src-org-apache-hadoop-security-hadoop_user_info.c) @@ -0,0 +1,20 @@ +--- hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/hadoop_user_info.c.bak 2014-06-21 09:40:12.000000000 +0400 ++++ hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/hadoop_user_info.c 2014-07-04 10:53:05.000000000 +0400 +@@ -36,7 +36,7 @@ + struct hadoop_user_info *hadoop_user_info_alloc(void) + { + struct hadoop_user_info *uinfo; +- size_t buf_sz; ++ long buf_sz; + char *buf; + + uinfo = calloc(1, sizeof(struct hadoop_user_info)); +@@ -193,7 +193,7 @@ + ngroups = uinfo->gids_size; + ret = getgrouplist(uinfo->pwd.pw_name, uinfo->pwd.pw_gid, + uinfo->gids, &ngroups); +- if (ret > 0) { ++ if (ret > 0 /* Linux */ || ret == 0 /* FreeBSD */) { + uinfo->num_gids = ngroups; + ret = put_primary_gid_first(uinfo); + if (ret) { Copied: head/devel/hadoop2/files/patch-hadoop-yarn-server-nodemanager-src-main-native-container-executor-impl-container-executor.c (from r361045, head/devel/hadoop2/files/patch-hadoop-yarn-project-hadoop-yarn-hadoop-yarn-server-hadoop-yarn-server-nodemanager-src-main-native-container-executor-impl-container-executor.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/hadoop2/files/patch-hadoop-yarn-server-nodemanager-src-main-native-container-executor-impl-container-executor.c Wed Jul 9 09:23:48 2014 (r361346, copy of r361045, head/devel/hadoop2/files/patch-hadoop-yarn-project-hadoop-yarn-hadoop-yarn-server-hadoop-yarn-server-nodemanager-src-main-native-container-executor-impl-container-executor.c) @@ -0,0 +1,43 @@ +# Patch from https://issues.apache.org/jira/browse/YARN-1327 +--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c ++++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c +@@ -19,6 +19,7 @@ + #include "configuration.h" + #include "container-executor.h" + ++#include <libgen.h> + #include <dirent.h> + #include <fcntl.h> + #include <fts.h> +@@ -496,9 +497,10 @@ static struct passwd* get_user_info(const char* user) { + int is_whitelisted(const char *user) { + char **whitelist = get_values(ALLOWED_SYSTEM_USERS_KEY); + char **users = whitelist; ++ int logname_size = sysconf(_SC_LOGIN_NAME_MAX); + if (whitelist != NULL) { + for(; *users; ++users) { +- if (strncmp(*users, user, LOGIN_NAME_MAX) == 0) { ++ if (strncmp(*users, user, logname_size) == 0) { + free_values(whitelist); + return 1; + } +@@ -1236,6 +1238,10 @@ void chown_dir_contents(const char *dir_path, uid_t uid, gid_t gid) { + * hierarchy: the top directory of the hierarchy for the NM + */ + int mount_cgroup(const char *pair, const char *hierarchy) { ++#ifndef __linux ++ fprintf(LOGFILE, "cgroups are supported only on Linux OS\n"); ++ return -1; ++#else + char *controller = malloc(strlen(pair)); + char *mount_path = malloc(strlen(pair)); + char hier_path[PATH_MAX]; +@@ -1270,7 +1276,7 @@ int mount_cgroup(const char *pair, const char *hierarchy) { + + free(controller); + free(mount_path); +- + return result; ++#endif + } + Copied: head/devel/hadoop2/files/patch-yarn-server-nodemanager-src-main-native-container-executor-test-test-container-executor.c (from r361045, head/devel/hadoop2/files/patch-hadoop-yarn-project-hadoop-yarn-hadoop-yarn-server-hadoop-yarn-server-nodemanager-src-main-native-container-executor-test-test-container-executor.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/hadoop2/files/patch-yarn-server-nodemanager-src-main-native-container-executor-test-test-container-executor.c Wed Jul 9 09:23:48 2014 (r361346, copy of r361045, head/devel/hadoop2/files/patch-hadoop-yarn-project-hadoop-yarn-hadoop-yarn-server-hadoop-yarn-server-nodemanager-src-main-native-container-executor-test-test-container-executor.c) @@ -0,0 +1,12 @@ +# Patch from https://issues.apache.org/jira/browse/YARN-1327 +--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c ++++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c +@@ -476,7 +476,7 @@ void test_signal_container_group() { + printf("FAIL: fork failed\n"); + exit(1); + } else if (child == 0) { +- setpgrp(); ++ setpgid(0,0); + if (change_user(user_detail->pw_uid, user_detail->pw_gid) != 0) { + exit(1); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407090923.s699NnAw089530>