From owner-svn-ports-head@FreeBSD.ORG Sat Nov 2 11:04:34 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A375A912; Sat, 2 Nov 2013 11:04:34 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8E4312EEE; Sat, 2 Nov 2013 11:04:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA2B4YKY038499; Sat, 2 Nov 2013 11:04:34 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA2B4Vke038484; Sat, 2 Nov 2013 11:04:31 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201311021104.rA2B4Vke038484@svn.freebsd.org> From: Tijl Coosemans Date: Sat, 2 Nov 2013 11:04:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332468 - in head/devel/hadoop: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Nov 2013 11:04:34 -0000 Author: tijl Date: Sat Nov 2 11:04:31 2013 New Revision: 332468 URL: http://svnweb.freebsd.org/changeset/ports/332468 Log: - Update Apache Hadoop to version 1.2.1. - Hand maintainership to submitter. - Replace HADOOP_HOME with DATADIR and HADOOP_ETC with ETCDIR. - Replace pkg-install and pkg-deinstall with pkg-plist entries. - Support staging. - Fix build on FreeBSD 10 (clang, libc++, hardcoded gcc). PR: ports/183307 Submitted by: Pedro Giffuni Added: head/devel/hadoop/files/patch-src-c++-libhdfs-configure (contents, props changed) head/devel/hadoop/files/patch-src-c++-pipes-impl-HadoopPipes.cc (contents, props changed) Deleted: head/devel/hadoop/files/patch-src__native__configure.ac head/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__io__nativeio__NativeIO.c head/devel/hadoop/files/pkg-deinstall.in head/devel/hadoop/files/pkg-install.in Modified: head/devel/hadoop/Makefile (contents, props changed) head/devel/hadoop/distinfo (contents, props changed) head/devel/hadoop/files/datanode.in (contents, props changed) head/devel/hadoop/files/hadoop.in (contents, props changed) head/devel/hadoop/files/jobtracker.in (contents, props changed) head/devel/hadoop/files/namenode.in (contents, props changed) head/devel/hadoop/files/patch-build.xml (contents, props changed) head/devel/hadoop/files/patch-src__native__Makefile.in (contents, props changed) head/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__security__JniBasedUnixGroupsNetgroupMapping.c (contents, props changed) head/devel/hadoop/files/secondarynamenode.in (contents, props changed) head/devel/hadoop/files/tasktracker.in (contents, props changed) head/devel/hadoop/pkg-plist (contents, props changed) Directory Properties: head/devel/hadoop/files/000.java_home.env.in (props changed) head/devel/hadoop/files/patch-src__c++__libhdfs__hdfs.c (props changed) head/devel/hadoop/files/patch-src__c++__libhdfs__hdfsJniHelper.c (props changed) head/devel/hadoop/files/patch-src__native__configure (props changed) head/devel/hadoop/pkg-descr (props changed) Modified: head/devel/hadoop/Makefile ============================================================================== --- head/devel/hadoop/Makefile Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/Makefile Sat Nov 2 11:04:31 2013 (r332468) @@ -2,65 +2,58 @@ # $FreeBSD$ PORTNAME= hadoop -PORTVERSION= 1.0.0 +PORTVERSION= 1.2.1 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= ${PORTNAME}/core/${PORTNAME}-${PORTVERSION} +PKGNAMEPREFIX= apache- DIST_SUBDIR= hadoop -MAINTAINER= ports@FreeBSD.org +MAINTAINER= pfg@apache.org COMMENT= Apache Map/Reduce framework LICENSE= AL2 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +BUILD_DEPENDS= gmake:${PORTSDIR}/devel/gmake \ + gsed:${PORTSDIR}/textproc/gsed +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_JAVA= yes JAVA_VERSION= 1.6 USE_ANT= yes -ONLY_FOR_ARCHS= amd64 i386 - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +DESTDIRNAME= -Ddestdir +ONLY_FOR_ARCHS= amd64 i386 -BUILD_DEPENDS+= ${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake \ - ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed -RUN_DEPENDS+= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash - -_HADOOP_DIR= share/${PORTNAME} -_HADOOP_ETC= etc/${PORTNAME} -HADOOP_HOME= ${PREFIX}/${_HADOOP_DIR} -HADOOP_ETC= ${PREFIX}/${_HADOOP_ETC} +OPTIONS_DEFINE= DOCS HADOOP_LOGDIR= /var/log/${PORTNAME} HADOOP_RUNDIR= /var/run/${PORTNAME} -HADOOP_BIN= ${PREFIX}/bin/${PORTNAME} -USERS= hadoop -GROUPS= hadoop -HADOOP_USER= ${USERS} -HADOOP_GROUP= ${GROUPS} - -SUB_FILES+= pkg-install pkg-deinstall hadoop 000.java_home.env -USE_RC_SUBR+= tasktracker jobtracker datanode namenode secondarynamenode - -PLIST_SUB+= PORTVERSION="${PORTVERSION}"\ - HADOOP_HOME="${_HADOOP_DIR}" \ - HADOOP_ETC="${_HADOOP_ETC}" -SUB_LIST= HADOOP_LOGDIR="${HADOOP_LOGDIR}" \ +HADOOP_USER= hadoop +HADOOP_GROUP= hadoop +USERS= ${HADOOP_USER} +GROUPS= ${HADOOP_GROUP} + +SUB_FILES= hadoop 000.java_home.env +USE_RC_SUBR= tasktracker jobtracker datanode namenode secondarynamenode + +PLIST_SUB= PORTVERSION="${PORTVERSION}" \ + HADOOP_LOGDIR="${HADOOP_LOGDIR}" \ HADOOP_RUNDIR="${HADOOP_RUNDIR}" \ HADOOP_USER="${HADOOP_USER}" \ + HADOOP_GROUP="${HADOOP_GROUP}" +SUB_LIST= HADOOP_USER="${HADOOP_USER}" \ HADOOP_GROUP="${HADOOP_GROUP}" \ - HADOOP_UID="${HADOOP_UID}" \ - HADOOP_GID="${HADOOP_GID}" \ - HADOOP_HOME="${HADOOP_HOME}" \ - HADOOP_ETC="${HADOOP_ETC}" \ JAVA_HOME="${JAVA_HOME}" PORTDOCS= * -FIX_PERMS= src/c++/pipes/install-sh src/c++/utils/install-sh src/c++/libhdfs/install-sh \ - src/c++/libhdfs/tests/test-libhdfs.sh -FIX_DOCS= docs/cn/skin/css docs/cn/skin/scripts docs/cn/skin/translations \ - docs/jdiff docs/skin/css docs/skin/scripts docs/skin/translations +FIX_GCC= src/c++/libhdfs/configure src/c++/pipes/configure \ + src/c++/task-controller/configure src/c++/utils/configure \ + src/examples/pipes/configure src/native/configure +FIX_PERMS= src/c++/pipes/install-sh src/c++/utils/install-sh \ + src/c++/libhdfs/install-sh src/c++/libhdfs/tests/test-libhdfs.sh +FIX_DOCS= docs/jdiff docs/skin/css docs/skin/scripts docs/skin/translations DOC= CHANGES.txt LICENSE.txt NOTICE.txt README.txt @@ -75,17 +68,21 @@ MAKE_ARGS= -Dbuild.classes=${WRKSRC}/had -Dcompile.c++=true -Dmake.cmd=${GMAKE} -Dlibhdfs=1 -Dlibrecordio=true -Dskip.record-parser=true ALL_TARGET= compile-core-native compile-c++ compile-c++-libhdfs compile-c++-pipes compile-c++-utils -NO_STAGE= yes -.include +.include .if ${ARCH} == "amd64" _HADOOP_ARCH= FreeBSD-amd64-64 .else -_HADOOP_ARCH= FreeBSD-i386-32 +_HADOOP_ARCH= FreeBSD-${ARCH}-32 .endif PLIST_SUB+= HADOOP_ARCH=${_HADOOP_ARCH} -pre-build: +post-patch: + @${REINPLACE_CMD} -e 's/ -DCPU=\\\\\\".*\\\\\\"//' \ + ${WRKSRC}/src/c++/libhdfs/configure +.for f in ${FIX_GCC} + @${REINPLACE_CMD} -e 's/`gcc/`$$LTCC/' ${WRKSRC}/${f} +.endfor .for f in ${FIX_PERMS} @${CHMOD} +x ${WRKSRC}/${f} .endfor @@ -93,50 +90,37 @@ pre-build: @${TOUCH} ${WRKSRC}/${d}/.empty .endfor -#do-build: -# @cd ${WRKSRC}; \ -# ${ANT} -Dbuild.classes=${WRKSRC}/hadoop-core-${PORTVERSION}.jar -Dversion=${PORTVERSION} -Dcompile.native=true \ -# -Dcompile.c++=true -Dmake.cmd=${GMAKE} compile-core-native compile-c++ compile-c++-libhdfs compile-c++-pipes \ -# compile-c++-utils -Dlibhdfs=1 -Dlibrecordio=true -Dskip.record-parser=true - post-build: @cd ${WRKSRC} ;${ANT} FreeBSD-dist @${TAR} -cf - -C ${WRKSRC}/build/c++/ ${_HADOOP_ARCH}/lib ${_HADOOP_ARCH}/include | ${TAR} xf - -C ${WRKSRC}/c++/ -pre-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - do-install: - @${MKDIR} ${HADOOP_HOME} - @${TAR} -cf - -C ${WRKSRC}/ ${DIST} | ${TAR} -xf - -C ${HADOOP_HOME} + ${MKDIR} ${STAGEDIR}${DATADIR} + ${TAR} -cf - -C ${WRKSRC} ${DIST} | ${TAR} -xf - -C ${STAGEDIR}${DATADIR} - @${MKDIR} ${HADOOP_ETC} ${HADOOP_ETC}/envvars.d - @${INSTALL_DATA} ${WRKDIR}/000.java_home.env ${HADOOP_ETC}/envvars.d/ - @${ECHO} "export HADOOP_HOME=${HADOOP_HOME}" > ${HADOOP_ETC}/envvars.d/001.hadoop_home.env - @${ECHO} "export HADOOP_CONF_DIR=${HADOOP_ETC}" > ${HADOOP_ETC}/envvars.d/002.hadoop_conf.env - @${ECHO} "export HADOOP_LOG_DIR=${HADOOP_LOGDIR}" > ${HADOOP_ETC}/envvars.d/003.hadoop_log.env - @${ECHO} "export HADOOP_PID_DIR=${HADOOP_RUNDIR}" > ${HADOOP_ETC}/envvars.d/004.hadoop_run.env - @${MKDIR} ${EXAMPLESDIR} - @${TAR} -cf - -C ${WRKSRC}/c++/${_HADOOP_ARCH}/ include lib| ${TAR} xf - -C ${PREFIX} + ${MKDIR} ${STAGEDIR}${ETCDIR}/envvars.d + ${INSTALL_DATA} ${WRKDIR}/000.java_home.env ${STAGEDIR}${ETCDIR}/envvars.d + ${ECHO} "export HADOOP_PREFIX=${DATADIR}" > ${STAGEDIR}${ETCDIR}/envvars.d/001.hadoop_home.env + ${ECHO} "export HADOOP_CONF_DIR=${ETCDIR}" > ${STAGEDIR}${ETCDIR}/envvars.d/002.hadoop_conf.env + ${ECHO} "export HADOOP_LOG_DIR=${HADOOP_LOGDIR}" > ${STAGEDIR}${ETCDIR}/envvars.d/003.hadoop_log.env + ${ECHO} "export HADOOP_PID_DIR=${HADOOP_RUNDIR}" > ${STAGEDIR}${ETCDIR}/envvars.d/004.hadoop_run.env + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${TAR} -cf - -C ${WRKSRC}/c++/${_HADOOP_ARCH} include lib | ${TAR} xf - -C ${STAGEDIR}${PREFIX} .for f in ${DEFAULTS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${TAR} -cf - -C ${WRKSRC}/ docs | ${TAR} -xf - -C ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR} .for f in ${DOC} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif - @${INSTALL_SCRIPT} ${WRKDIR}/hadoop ${PREFIX}/bin/ - @cd ${WRKSRC}; ${COPYTREE_SHARE} conf ${EXAMPLESDIR} -.for f in ${CONF} - @[ -f ${HADOOP_ETC}/${f} ] || ${INSTALL_DATA} ${EXAMPLESDIR}/conf/${f} ${HADOOP_ETC} -.endfor - -post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${INSTALL_SCRIPT} ${WRKDIR}/hadoop ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC} && ${COPYTREE_SHARE} conf ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${HADOOP_LOGDIR} + ${MKDIR} ${STAGEDIR}${HADOOP_RUNDIR} -.include +.include Modified: head/devel/hadoop/distinfo ============================================================================== --- head/devel/hadoop/distinfo Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/distinfo Sat Nov 2 11:04:31 2013 (r332468) @@ -1,2 +1,2 @@ -SHA256 (hadoop/hadoop-1.0.0.tar.gz) = 587bc9389d062f4e8042f2604b2d9a574080d4178614cccc07c5e5d743836f71 -SIZE (hadoop/hadoop-1.0.0.tar.gz) = 59468784 +SHA256 (hadoop/hadoop-1.2.1.tar.gz) = 94a1181771f173bdb55c8f901722825866396091f0516bdd12b34dc3de1706a1 +SIZE (hadoop/hadoop-1.2.1.tar.gz) = 63851630 Modified: head/devel/hadoop/files/datanode.in ============================================================================== --- head/devel/hadoop/files/datanode.in Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/files/datanode.in Sat Nov 2 11:04:31 2013 (r332468) @@ -31,7 +31,7 @@ load_rc_config "${name}" : ${datanode_user:=%%HADOOP_USER%%} : ${datanode_group:=%%HADOOP_GROUP%%} -command="%%HADOOP_HOME%%/bin/hadoop-daemon.sh" +command="%%DATADIR%%/bin/hadoop-daemon.sh" command_args='--config ${HADOOP_CONF_DIR} start datanode' start_precmd=datanode_init @@ -46,7 +46,7 @@ datanode_init() export JAVA_HOME="${datanode_java_home}" fi - for f in %%HADOOP_ETC%%/envvars.d/*.env + for f in %%ETCDIR%%/envvars.d/*.env do . ${f} done Modified: head/devel/hadoop/files/hadoop.in ============================================================================== --- head/devel/hadoop/files/hadoop.in Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/files/hadoop.in Sat Nov 2 11:04:31 2013 (r332468) @@ -1,7 +1,7 @@ #!/usr/bin/env bash -for i in `ls %%HADOOP_ETC%%/envvars.d/*.env` +for i in `ls %%ETCDIR%%/envvars.d/*.env` do . ${i} done -exec %%HADOOP_HOME%%/bin/hadoop $@ +exec %%DATADIR%%/bin/hadoop $@ Modified: head/devel/hadoop/files/jobtracker.in ============================================================================== --- head/devel/hadoop/files/jobtracker.in Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/files/jobtracker.in Sat Nov 2 11:04:31 2013 (r332468) @@ -31,7 +31,7 @@ load_rc_config "${name}" : ${jobtracker_user:=%%HADOOP_USER%%} : ${jobtracker_group:=%%HADOOP_GROUP%%} -command="%%HADOOP_HOME%%/bin/hadoop-daemon.sh" +command="%%DATADIR%%/bin/hadoop-daemon.sh" command_args='--config ${HADOOP_CONF_DIR} start jobtracker' start_precmd=jobtracker_init @@ -46,7 +46,7 @@ jobtracker_init() export JAVA_HOME="${jobtracker_java_home}" fi - for f in %%HADOOP_ETC%%/envvars.d/*.env + for f in %%ETCDIR%%/envvars.d/*.env do . ${f} done Modified: head/devel/hadoop/files/namenode.in ============================================================================== --- head/devel/hadoop/files/namenode.in Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/files/namenode.in Sat Nov 2 11:04:31 2013 (r332468) @@ -31,7 +31,7 @@ load_rc_config "${name}" : ${namenode_user:=%%HADOOP_USER%%} : ${namenode_group:=%%HADOOP_GROUP%%} -command="%%HADOOP_HOME%%/bin/hadoop-daemon.sh" +command="%%DATADIR%%/bin/hadoop-daemon.sh" command_args='--config ${HADOOP_CONF_DIR} start namenode' start_precmd=namenode_init @@ -46,7 +46,7 @@ namenode_init() export JAVA_HOME="${namenode_java_home}" fi - for f in %%HADOOP_ETC%%/envvars.d/*.env + for f in %%ETCDIR%%/envvars.d/*.env do . ${f} done Modified: head/devel/hadoop/files/patch-build.xml ============================================================================== --- head/devel/hadoop/files/patch-build.xml Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/files/patch-build.xml Sat Nov 2 11:04:31 2013 (r332468) @@ -1,6 +1,6 @@ ---- build.xml.orig 2011-05-04 08:30:16.000000000 +0200 -+++ build.xml 2011-08-08 00:08:22.000000000 +0200 -@@ -372,7 +372,7 @@ +--- build.xml.orig 2013-07-23 00:26:41.000000000 +0200 ++++ build.xml 2013-10-29 16:27:54.000000000 +0100 +@@ -452,7 +452,7 @@ @@ -9,16 +9,16 @@ +@@ -636,7 +636,7 @@ + -- -@@ -1669,7 +1669,7 @@ +@@ -2042,7 +2042,7 @@ @@ -27,7 +27,7 @@ -@@ -1703,7 +1703,7 @@ +@@ -2076,7 +2076,7 @@ @@ -36,7 +36,7 @@ -@@ -1726,7 +1726,7 @@ +@@ -2099,7 +2099,7 @@ @@ -45,7 +45,7 @@ -@@ -1747,7 +1747,7 @@ +@@ -2120,7 +2120,7 @@ @@ -54,8 +54,17 @@ -@@ -2326,5 +2326,23 @@ - +@@ -2176,7 +2176,7 @@ + + + ++ depends="compile-c++-pipes"/> + + + Added: head/devel/hadoop/files/patch-src-c++-libhdfs-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/hadoop/files/patch-src-c++-libhdfs-configure Sat Nov 2 11:04:31 2013 (r332468) @@ -0,0 +1,11 @@ +--- src/c++/libhdfs/configure.orig 2013-07-23 00:26:40.000000000 +0200 ++++ src/c++/libhdfs/configure 2013-11-01 12:45:14.000000000 +0100 +@@ -3782,7 +3782,7 @@ + i?86) + CFLAGS="$CFLAGS -DCPU=\\\"i386\\\"" + HOST_CPU=i386;; +- x86_64) ++ amd64|x86_64) + CFLAGS="$CFLAGS -DCPU=\\\"amd64\\\"" + HOST_CPU=amd64;; + bs2000) Added: head/devel/hadoop/files/patch-src-c++-pipes-impl-HadoopPipes.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/hadoop/files/patch-src-c++-pipes-impl-HadoopPipes.cc Sat Nov 2 11:04:31 2013 (r332468) @@ -0,0 +1,10 @@ +--- src/c++/pipes/impl/HadoopPipes.cc.orig 2013-07-23 00:26:40.000000000 +0200 ++++ src/c++/pipes/impl/HadoopPipes.cc 2013-10-30 15:42:33.000000000 +0100 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include + #include Modified: head/devel/hadoop/files/patch-src__native__Makefile.in ============================================================================== --- head/devel/hadoop/files/patch-src__native__Makefile.in Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/files/patch-src__native__Makefile.in Sat Nov 2 11:04:31 2013 (r332468) @@ -1,52 +1,56 @@ ---- src/native/Makefile.in.orig 2011-05-04 08:30:16.000000000 +0200 -+++ src/native/Makefile.in 2011-12-09 10:38:40.000000000 +0100 -@@ -92,10 +92,7 @@ - libLTLIBRARIES_INSTALL = $(INSTALL) +--- src/native/Makefile.in.orig 2013-07-22 17:26:40.000000000 -0500 ++++ src/native/Makefile.in 2013-10-25 09:42:34.000000000 -0500 +@@ -93,10 +93,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libhadoop_la_DEPENDENCIES = --am_libhadoop_la_OBJECTS = ZlibCompressor.lo ZlibDecompressor.lo \ -- getGroup.lo JniBasedUnixGroupsMapping.lo \ + am_libhadoop_la_OBJECTS = ZlibCompressor.lo ZlibDecompressor.lo \ +- SnappyCompressor.lo SnappyDecompressor.lo getGroup.lo \ +- JniBasedUnixGroupsMapping.lo \ - JniBasedUnixGroupsNetgroupMapping.lo file_descriptor.lo \ - errno_enum.lo NativeIO.lo -+am_libhadoop_la_OBJECTS = ZlibCompressor.lo ZlibDecompressor.lo ++ SnappyCompressor.lo SnappyDecompressor.lo libhadoop_la_OBJECTS = $(am_libhadoop_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/config/depcomp -@@ -223,24 +220,15 @@ - sysconfdir = @sysconfdir@ +@@ -230,9 +227,7 @@ target_alias = @target_alias@ AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src \ -- -Isrc/org/apache/hadoop/io/compress/zlib \ + -Isrc/org/apache/hadoop/io/compress/zlib \ +- -Isrc/org/apache/hadoop/io/compress/snappy \ - -Isrc/org/apache/hadoop/io/nativeio \ - -Isrc/org/apache/hadoop/security -+ -Isrc/org/apache/hadoop/io/compress/zlib ++ -Isrc/org/apache/hadoop/io/compress/snappy AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL) AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL) - lib_LTLIBRARIES = libhadoop.la +@@ -240,16 +235,10 @@ libhadoop_la_SOURCES = src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c \ -- src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c \ + src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c \ + src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c \ +- src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c \ - src/org/apache/hadoop/security/getGroup.c \ - src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c \ - src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c \ - src/org/apache/hadoop/io/nativeio/file_descriptor.c \ - src/org/apache/hadoop/io/nativeio/errno_enum.c \ - src/org/apache/hadoop/io/nativeio/NativeIO.c -- -+ src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c - libhadoop_la_LDFLAGS = -version-info 1:0:0 ++ src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c + + libhadoop_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) -libhadoop_la_LIBADD = -ldl -ljvm +libhadoop_la_LIBADD = -ljvm all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am -@@ -332,14 +320,8 @@ +@@ -341,16 +330,10 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JniBasedUnixGroupsMapping.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JniBasedUnixGroupsNetgroupMapping.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NativeIO.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SnappyCompressor.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SnappyDecompressor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ZlibCompressor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ZlibDecompressor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errno_enum.Plo@am__quote@ @@ -55,9 +59,9 @@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@@ -376,47 +358,6 @@ +@@ -401,47 +384,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ZlibDecompressor.lo `test -f 'src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c + @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o SnappyDecompressor.lo `test -f 'src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c -getGroup.lo: src/org/apache/hadoop/security/getGroup.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getGroup.lo -MD -MP -MF "$(DEPDIR)/getGroup.Tpo" -c -o getGroup.lo `test -f 'src/org/apache/hadoop/security/getGroup.c' || echo '$(srcdir)/'`src/org/apache/hadoop/security/getGroup.c; \ Modified: head/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__security__JniBasedUnixGroupsNetgroupMapping.c ============================================================================== --- head/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__security__JniBasedUnixGroupsNetgroupMapping.c Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__security__JniBasedUnixGroupsNetgroupMapping.c Sat Nov 2 11:04:31 2013 (r332468) @@ -1,12 +1,11 @@ --- src/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c.orig 2011-08-07 16:43:00.000000000 +0200 +++ src/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c 2011-08-07 16:43:30.000000000 +0200 -@@ -73,7 +73,8 @@ +@@ -73,7 +73,7 @@ // was successfull or not (as long as it was called we need to call // endnetgrent) setnetgrentCalledFlag = 1; - if(setnetgrent(cgroup) == 1) { -+ setnetgrent(cgroup); -+ if(1 == 1) { ++ if(setnetgrent(cgroup) >= 1) { UserList *current = NULL; // three pointers are for host, user, domain, we only care // about user now Modified: head/devel/hadoop/files/secondarynamenode.in ============================================================================== --- head/devel/hadoop/files/secondarynamenode.in Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/files/secondarynamenode.in Sat Nov 2 11:04:31 2013 (r332468) @@ -31,7 +31,7 @@ load_rc_config "${name}" : ${secondarynamenode_user:=%%HADOOP_USER%%} : ${secondarynamenode_group:=%%HADOOP_GROUP%%} -command="%%HADOOP_HOME%%/bin/hadoop-daemon.sh" +command="%%DATADIR%%/bin/hadoop-daemon.sh" command_args='--config ${HADOOP_CONF_DIR} start secondarynamenode' start_precmd=secondarynamenode_init @@ -46,7 +46,7 @@ secondarynamenode_init() export JAVA_HOME="${secondarynamenode_java_home}" fi - for f in %%HADOOP_ETC%%/envvars.d/*.env + for f in %%ETCDIR%%/envvars.d/*.env do . ${f} done Modified: head/devel/hadoop/files/tasktracker.in ============================================================================== --- head/devel/hadoop/files/tasktracker.in Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/files/tasktracker.in Sat Nov 2 11:04:31 2013 (r332468) @@ -31,7 +31,7 @@ load_rc_config "${name}" : ${tasktracker_user:=%%HADOOP_USER%%} : ${tasktracker_group:=%%HADOOP_GROUP%%} -command="%%HADOOP_HOME%%/bin/hadoop-daemon.sh" +command="%%DATADIR%%/bin/hadoop-daemon.sh" command_args='--config ${HADOOP_CONF_DIR} start tasktracker' start_precmd=tasktracker_init @@ -46,7 +46,7 @@ tasktracker_init() export JAVA_HOME="${tasktracker_java_home}" fi - for f in %%HADOOP_ETC%%/envvars.d/*.env + for f in %%ETCDIR%%/envvars.d/*.env do . ${f} done Modified: head/devel/hadoop/pkg-plist ============================================================================== --- head/devel/hadoop/pkg-plist Sat Nov 2 10:48:35 2013 (r332467) +++ head/devel/hadoop/pkg-plist Sat Nov 2 11:04:31 2013 (r332468) @@ -1,346 +1,364 @@ bin/hadoop -%%HADOOP_ETC%%/envvars.d/000.java_home.env -%%HADOOP_ETC%%/envvars.d/001.hadoop_home.env -%%HADOOP_ETC%%/envvars.d/002.hadoop_conf.env -%%HADOOP_ETC%%/envvars.d/003.hadoop_log.env -%%HADOOP_ETC%%/envvars.d/004.hadoop_run.env -%%HADOOP_HOME%%/bin/hadoop -%%HADOOP_HOME%%/bin/hadoop-config.sh -%%HADOOP_HOME%%/bin/hadoop-daemon.sh -%%HADOOP_HOME%%/bin/hadoop-daemons.sh -%%HADOOP_HOME%%/bin/rcc -%%HADOOP_HOME%%/bin/slaves.sh -%%HADOOP_HOME%%/bin/start-all.sh -%%HADOOP_HOME%%/bin/start-balancer.sh -%%HADOOP_HOME%%/bin/start-dfs.sh -%%HADOOP_HOME%%/bin/start-jobhistoryserver.sh -%%HADOOP_HOME%%/bin/start-mapred.sh -%%HADOOP_HOME%%/bin/stop-all.sh -%%HADOOP_HOME%%/bin/stop-balancer.sh -%%HADOOP_HOME%%/bin/stop-dfs.sh -%%HADOOP_HOME%%/bin/stop-jobhistoryserver.sh -%%HADOOP_HOME%%/bin/stop-mapred.sh -%%HADOOP_HOME%%/bin/task-controller -%%HADOOP_HOME%%/lib/hadoop-capacity-scheduler-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/contrib/datajoin/hadoop-datajoin-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/contrib/failmon/hadoop-failmon-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/lib/hadoop-fairscheduler-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/contrib/gridmix/hadoop-gridmix-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/contrib/hdfsproxy/bin/hdfsproxy -%%HADOOP_HOME%%/contrib/hdfsproxy/bin/hdfsproxy-config.sh -%%HADOOP_HOME%%/contrib/hdfsproxy/bin/hdfsproxy-daemon.sh -%%HADOOP_HOME%%/contrib/hdfsproxy/bin/hdfsproxy-daemons.sh -%%HADOOP_HOME%%/contrib/hdfsproxy/bin/hdfsproxy-slaves.sh -%%HADOOP_HOME%%/contrib/hdfsproxy/bin/start-hdfsproxy.sh -%%HADOOP_HOME%%/contrib/hdfsproxy/bin/stop-hdfsproxy.sh -%%HADOOP_HOME%%/contrib/hdfsproxy/conf/configuration.xsl -%%HADOOP_HOME%%/contrib/hdfsproxy/conf/hdfsproxy-default.xml -%%HADOOP_HOME%%/contrib/hdfsproxy/conf/hdfsproxy-env.sh -%%HADOOP_HOME%%/contrib/hdfsproxy/conf/hdfsproxy-env.sh.template -%%HADOOP_HOME%%/contrib/hdfsproxy/conf/hdfsproxy-hosts -%%HADOOP_HOME%%/contrib/hdfsproxy/conf/log4j.properties -%%HADOOP_HOME%%/contrib/hdfsproxy/conf/ssl-server.xml -%%HADOOP_HOME%%/contrib/hdfsproxy/conf/tomcat-forward-web.xml -%%HADOOP_HOME%%/contrib/hdfsproxy/conf/tomcat-web.xml -%%HADOOP_HOME%%/contrib/hdfsproxy/conf/user-certs.xml -%%HADOOP_HOME%%/contrib/hdfsproxy/conf/user-permissions.xml -%%HADOOP_HOME%%/contrib/hdfsproxy/README -%%HADOOP_HOME%%/contrib/hdfsproxy/build.xml -%%HADOOP_HOME%%/contrib/hdfsproxy/hdfsproxy-2.0.jar -%%HADOOP_HOME%%/contrib/hod/bin/VERSION -%%HADOOP_HOME%%/contrib/hod/bin/checknodes -%%HADOOP_HOME%%/contrib/hod/bin/hod -%%HADOOP_HOME%%/contrib/hod/bin/hodcleanup -%%HADOOP_HOME%%/contrib/hod/bin/hodring -%%HADOOP_HOME%%/contrib/hod/bin/ringmaster -%%HADOOP_HOME%%/contrib/hod/bin/verify-account -%%HADOOP_HOME%%/contrib/hod/conf/hodrc -%%HADOOP_HOME%%/contrib/hod/hodlib/AllocationManagers/__init__.py -%%HADOOP_HOME%%/contrib/hod/hodlib/AllocationManagers/goldAllocationManager.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/__init__.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/allocationManagerUtil.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/desc.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/descGenerator.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/hodsvc.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/logger.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/miniHTMLParser.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/nodepoolutil.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/setup.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/socketServers.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/tcp.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/threads.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/types.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/util.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Common/xmlrpc.py -%%HADOOP_HOME%%/contrib/hod/hodlib/GridServices/__init__.py -%%HADOOP_HOME%%/contrib/hod/hodlib/GridServices/hdfs.py -%%HADOOP_HOME%%/contrib/hod/hodlib/GridServices/mapred.py -%%HADOOP_HOME%%/contrib/hod/hodlib/GridServices/service.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Hod/__init__.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Hod/hadoop.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Hod/hod.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Hod/nodePool.py -%%HADOOP_HOME%%/contrib/hod/hodlib/HodRing/__init__.py -%%HADOOP_HOME%%/contrib/hod/hodlib/HodRing/hodRing.py -%%HADOOP_HOME%%/contrib/hod/hodlib/NodePools/__init__.py -%%HADOOP_HOME%%/contrib/hod/hodlib/NodePools/torque.py -%%HADOOP_HOME%%/contrib/hod/hodlib/RingMaster/__init__.py -%%HADOOP_HOME%%/contrib/hod/hodlib/RingMaster/idleJobTracker.py -%%HADOOP_HOME%%/contrib/hod/hodlib/RingMaster/ringMaster.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Schedulers/__init__.py -%%HADOOP_HOME%%/contrib/hod/hodlib/Schedulers/torque.py -%%HADOOP_HOME%%/contrib/hod/hodlib/ServiceProxy/__init__.py -%%HADOOP_HOME%%/contrib/hod/hodlib/ServiceProxy/serviceProxy.py -%%HADOOP_HOME%%/contrib/hod/hodlib/ServiceRegistry/__init__.py -%%HADOOP_HOME%%/contrib/hod/hodlib/ServiceRegistry/serviceRegistry.py -%%HADOOP_HOME%%/contrib/hod/hodlib/__init__.py -%%HADOOP_HOME%%/contrib/hod/ivy/libraries.properties -%%HADOOP_HOME%%/contrib/hod/support/checklimits.sh -%%HADOOP_HOME%%/contrib/hod/support/logcondense.py -%%HADOOP_HOME%%/contrib/hod/testing/__init__.py -%%HADOOP_HOME%%/contrib/hod/testing/helper.py -%%HADOOP_HOME%%/contrib/hod/testing/lib.py -%%HADOOP_HOME%%/contrib/hod/testing/main.py -%%HADOOP_HOME%%/contrib/hod/testing/testHadoop.py -%%HADOOP_HOME%%/contrib/hod/testing/testHod.py -%%HADOOP_HOME%%/contrib/hod/testing/testHodCleanup.py -%%HADOOP_HOME%%/contrib/hod/testing/testHodRing.py -%%HADOOP_HOME%%/contrib/hod/testing/testModule.py -%%HADOOP_HOME%%/contrib/hod/testing/testRingmasterRPCs.py -%%HADOOP_HOME%%/contrib/hod/testing/testThreads.py -%%HADOOP_HOME%%/contrib/hod/testing/testTypes.py -%%HADOOP_HOME%%/contrib/hod/testing/testUtil.py -%%HADOOP_HOME%%/contrib/hod/testing/testXmlrpc.py -%%HADOOP_HOME%%/contrib/hod/CHANGES.txt -%%HADOOP_HOME%%/contrib/hod/README -%%HADOOP_HOME%%/contrib/hod/build.xml -%%HADOOP_HOME%%/contrib/hod/config.txt -%%HADOOP_HOME%%/contrib/hod/getting_started.txt -%%HADOOP_HOME%%/contrib/hod/ivy.xml -%%HADOOP_HOME%%/contrib/index/hadoop-index-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/contrib/streaming/hadoop-streaming-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/lib/hadoop-thriftfs-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/contrib/vaidya/bin/vaidya.sh -%%HADOOP_HOME%%/contrib/vaidya/conf/postex_diagnosis_tests.xml -%%HADOOP_HOME%%/contrib/vaidya/hadoop-vaidya-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/hadoop-ant-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/hadoop-core-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/hadoop-test-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/hadoop-tools-%%PORTVERSION%%.jar -%%HADOOP_HOME%%/lib/jdiff/hadoop_0.17.0.xml -%%HADOOP_HOME%%/lib/jdiff/hadoop_0.18.1.xml -%%HADOOP_HOME%%/lib/jdiff/hadoop_0.18.2.xml -%%HADOOP_HOME%%/lib/jdiff/hadoop_0.18.3.xml -%%HADOOP_HOME%%/lib/jdiff/hadoop_0.19.0.xml -%%HADOOP_HOME%%/lib/jdiff/hadoop_0.19.1.xml -%%HADOOP_HOME%%/lib/jdiff/hadoop_0.19.2.xml -%%HADOOP_HOME%%/lib/jdiff/hadoop_0.20.1.xml -%%HADOOP_HOME%%/lib/jdiff/hadoop_0.20.205.0.xml -%%HADOOP_HOME%%/lib/jdiff/hadoop_%%PORTVERSION%%.xml -%%HADOOP_HOME%%/lib/jsp-2.1/jsp-2.1.jar -%%HADOOP_HOME%%/lib/jsp-2.1/jsp-api-2.1.jar -%%HADOOP_HOME%%/lib/native/Linux-amd64-64/libhadoop.a -%%HADOOP_HOME%%/lib/native/Linux-amd64-64/libhadoop.la -%%HADOOP_HOME%%/lib/native/Linux-amd64-64/libhadoop.so -%%HADOOP_HOME%%/lib/native/Linux-amd64-64/libhadoop.so.1 -%%HADOOP_HOME%%/lib/native/Linux-amd64-64/libhadoop.so.1.0.0 -%%HADOOP_HOME%%/lib/native/Linux-i386-32/libhadoop.a -%%HADOOP_HOME%%/lib/native/Linux-i386-32/libhadoop.la -%%HADOOP_HOME%%/lib/native/Linux-i386-32/libhadoop.so -%%HADOOP_HOME%%/lib/native/Linux-i386-32/libhadoop.so.1 -%%HADOOP_HOME%%/lib/native/Linux-i386-32/libhadoop.so.1.0.0 -%%HADOOP_HOME%%/lib/native/%%HADOOP_ARCH%%/libhadoop.a -%%HADOOP_HOME%%/lib/native/%%HADOOP_ARCH%%/libhadoop.la -%%HADOOP_HOME%%/lib/native/%%HADOOP_ARCH%%/libhadoop.so -%%HADOOP_HOME%%/lib/native/%%HADOOP_ARCH%%/libhadoop.so.1 -%%HADOOP_HOME%%/lib/asm-3.2.jar -%%HADOOP_HOME%%/lib/aspectjrt-1.6.5.jar -%%HADOOP_HOME%%/lib/aspectjtools-1.6.5.jar -%%HADOOP_HOME%%/lib/commons-beanutils-1.7.0.jar -%%HADOOP_HOME%%/lib/commons-beanutils-core-1.8.0.jar -%%HADOOP_HOME%%/lib/commons-cli-1.2.jar -%%HADOOP_HOME%%/lib/commons-codec-1.4.jar -%%HADOOP_HOME%%/lib/commons-collections-3.2.1.jar -%%HADOOP_HOME%%/lib/commons-configuration-1.6.jar -%%HADOOP_HOME%%/lib/commons-daemon-1.0.1.jar -%%HADOOP_HOME%%/lib/commons-digester-1.8.jar -%%HADOOP_HOME%%/lib/commons-el-1.0.jar -%%HADOOP_HOME%%/lib/commons-httpclient-3.0.1.jar -%%HADOOP_HOME%%/lib/commons-lang-2.4.jar -%%HADOOP_HOME%%/lib/commons-logging-1.1.1.jar -%%HADOOP_HOME%%/lib/commons-logging-api-1.0.4.jar -%%HADOOP_HOME%%/lib/commons-math-2.1.jar -%%HADOOP_HOME%%/lib/commons-net-1.4.1.jar -%%HADOOP_HOME%%/lib/core-3.1.1.jar -%%HADOOP_HOME%%/lib/hsqldb-1.8.0.10.LICENSE.txt -%%HADOOP_HOME%%/lib/hsqldb-1.8.0.10.jar -%%HADOOP_HOME%%/lib/jackson-core-asl-1.0.1.jar -%%HADOOP_HOME%%/lib/jackson-mapper-asl-1.0.1.jar -%%HADOOP_HOME%%/lib/jasper-compiler-5.5.12.jar -%%HADOOP_HOME%%/lib/jasper-runtime-5.5.12.jar -%%HADOOP_HOME%%/lib/jdeb-0.8.jar -%%HADOOP_HOME%%/lib/jersey-core-1.8.jar -%%HADOOP_HOME%%/lib/jersey-json-1.8.jar -%%HADOOP_HOME%%/lib/jersey-server-1.8.jar -%%HADOOP_HOME%%/lib/jets3t-0.6.1.jar -%%HADOOP_HOME%%/lib/jetty-6.1.26.jar -%%HADOOP_HOME%%/lib/jetty-util-6.1.26.jar -%%HADOOP_HOME%%/lib/jsch-0.1.42.jar -%%HADOOP_HOME%%/lib/junit-4.5.jar -%%HADOOP_HOME%%/lib/kfs-0.2.2.jar -%%HADOOP_HOME%%/lib/kfs-0.2.LICENSE.txt -%%HADOOP_HOME%%/lib/log4j-1.2.15.jar -%%HADOOP_HOME%%/lib/mockito-all-1.8.5.jar -%%HADOOP_HOME%%/lib/oro-2.0.8.jar -%%HADOOP_HOME%%/lib/servlet-api-2.5-20081211.jar -%%HADOOP_HOME%%/lib/slf4j-api-1.4.3.jar -%%HADOOP_HOME%%/lib/slf4j-log4j12-1.4.3.jar -%%HADOOP_HOME%%/lib/xmlenc-0.52.jar -%%HADOOP_HOME%%/webapps/task/index.html -%%HADOOP_HOME%%/webapps/task/WEB-INF/web.xml -%%HADOOP_HOME%%/webapps/static/sorttable.js -%%HADOOP_HOME%%/webapps/static/jobtracker.js -%%HADOOP_HOME%%/webapps/static/jobconf.xsl -%%HADOOP_HOME%%/webapps/static/hadoop.css -%%HADOOP_HOME%%/webapps/static/hadoop-logo.jpg -%%HADOOP_HOME%%/webapps/job/taskstatshistory.jsp -%%HADOOP_HOME%%/webapps/job/taskstats.jsp -%%HADOOP_HOME%%/webapps/job/taskdetailshistory.jsp -%%HADOOP_HOME%%/webapps/job/taskdetails.jsp -%%HADOOP_HOME%%/webapps/job/machines.jsp -%%HADOOP_HOME%%/webapps/job/loadhistory.jsp -%%HADOOP_HOME%%/webapps/job/legacyjobhistory.jsp -%%HADOOP_HOME%%/webapps/job/jobtracker.jsp -%%HADOOP_HOME%%/webapps/job/jobtaskshistory.jsp -%%HADOOP_HOME%%/webapps/job/jobtasks.jsp -%%HADOOP_HOME%%/webapps/job/jobqueue_details.jsp -%%HADOOP_HOME%%/webapps/job/jobhistoryhome.jsp -%%HADOOP_HOME%%/webapps/job/jobhistory.jsp -%%HADOOP_HOME%%/webapps/job/jobfailures.jsp -%%HADOOP_HOME%%/webapps/job/jobdetailshistory.jsp -%%HADOOP_HOME%%/webapps/job/jobdetails.jsp -%%HADOOP_HOME%%/webapps/job/jobconf_history.jsp -%%HADOOP_HOME%%/webapps/job/jobconf.jsp -%%HADOOP_HOME%%/webapps/job/jobblacklistedtrackers.jsp -%%HADOOP_HOME%%/webapps/job/job_authorization_error.jsp -%%HADOOP_HOME%%/webapps/job/index.html -%%HADOOP_HOME%%/webapps/job/gethistory.jsp -%%HADOOP_HOME%%/webapps/job/analysejobhistory.jsp -%%HADOOP_HOME%%/webapps/job/WEB-INF/web.xml -%%HADOOP_HOME%%/webapps/history/WEB-INF/web.xml -%%HADOOP_HOME%%/webapps/hdfs/index.html -%%HADOOP_HOME%%/webapps/hdfs/WEB-INF/web.xml -%%HADOOP_HOME%%/webapps/datanode/WEB-INF/web.xml +%%ETCDIR%%/envvars.d/000.java_home.env +%%ETCDIR%%/envvars.d/001.hadoop_home.env +%%ETCDIR%%/envvars.d/002.hadoop_conf.env +%%ETCDIR%%/envvars.d/003.hadoop_log.env +%%ETCDIR%%/envvars.d/004.hadoop_run.env +%%DATADIR%%/bin/hadoop +%%DATADIR%%/bin/hadoop-config.sh +%%DATADIR%%/bin/hadoop-daemon.sh +%%DATADIR%%/bin/hadoop-daemons.sh +%%DATADIR%%/bin/rcc +%%DATADIR%%/bin/slaves.sh +%%DATADIR%%/bin/start-all.sh +%%DATADIR%%/bin/start-balancer.sh +%%DATADIR%%/bin/start-dfs.sh +%%DATADIR%%/bin/start-jobhistoryserver.sh +%%DATADIR%%/bin/start-mapred.sh +%%DATADIR%%/bin/stop-all.sh +%%DATADIR%%/bin/stop-balancer.sh +%%DATADIR%%/bin/stop-dfs.sh +%%DATADIR%%/bin/stop-jobhistoryserver.sh +%%DATADIR%%/bin/stop-mapred.sh +%%DATADIR%%/bin/task-controller +%%DATADIR%%/lib/hadoop-capacity-scheduler-%%PORTVERSION%%.jar +%%DATADIR%%/contrib/datajoin/hadoop-datajoin-%%PORTVERSION%%.jar +%%DATADIR%%/contrib/failmon/hadoop-failmon-%%PORTVERSION%%.jar +%%DATADIR%%/lib/hadoop-fairscheduler-%%PORTVERSION%%.jar +%%DATADIR%%/contrib/gridmix/hadoop-gridmix-%%PORTVERSION%%.jar +%%DATADIR%%/contrib/hdfsproxy/bin/hdfsproxy +%%DATADIR%%/contrib/hdfsproxy/bin/hdfsproxy-config.sh +%%DATADIR%%/contrib/hdfsproxy/bin/hdfsproxy-daemon.sh +%%DATADIR%%/contrib/hdfsproxy/bin/hdfsproxy-daemons.sh +%%DATADIR%%/contrib/hdfsproxy/bin/hdfsproxy-slaves.sh +%%DATADIR%%/contrib/hdfsproxy/bin/start-hdfsproxy.sh +%%DATADIR%%/contrib/hdfsproxy/bin/stop-hdfsproxy.sh +%%DATADIR%%/contrib/hdfsproxy/conf/configuration.xsl +%%DATADIR%%/contrib/hdfsproxy/conf/hdfsproxy-default.xml +%%DATADIR%%/contrib/hdfsproxy/conf/hdfsproxy-env.sh +%%DATADIR%%/contrib/hdfsproxy/conf/hdfsproxy-env.sh.template +%%DATADIR%%/contrib/hdfsproxy/conf/hdfsproxy-hosts +%%DATADIR%%/contrib/hdfsproxy/conf/log4j.properties +%%DATADIR%%/contrib/hdfsproxy/conf/ssl-server.xml +%%DATADIR%%/contrib/hdfsproxy/conf/tomcat-forward-web.xml +%%DATADIR%%/contrib/hdfsproxy/conf/tomcat-web.xml +%%DATADIR%%/contrib/hdfsproxy/conf/user-certs.xml +%%DATADIR%%/contrib/hdfsproxy/conf/user-permissions.xml +%%DATADIR%%/contrib/hdfsproxy/README +%%DATADIR%%/contrib/hdfsproxy/build.xml +%%DATADIR%%/contrib/hdfsproxy/hdfsproxy-2.0.jar +%%DATADIR%%/contrib/hod/bin/VERSION +%%DATADIR%%/contrib/hod/bin/checknodes +%%DATADIR%%/contrib/hod/bin/hod +%%DATADIR%%/contrib/hod/bin/hodcleanup +%%DATADIR%%/contrib/hod/bin/hodring +%%DATADIR%%/contrib/hod/bin/ringmaster +%%DATADIR%%/contrib/hod/bin/verify-account +%%DATADIR%%/contrib/hod/conf/hodrc +%%DATADIR%%/contrib/hod/hodlib/AllocationManagers/__init__.py +%%DATADIR%%/contrib/hod/hodlib/AllocationManagers/goldAllocationManager.py +%%DATADIR%%/contrib/hod/hodlib/Common/__init__.py +%%DATADIR%%/contrib/hod/hodlib/Common/allocationManagerUtil.py +%%DATADIR%%/contrib/hod/hodlib/Common/desc.py +%%DATADIR%%/contrib/hod/hodlib/Common/descGenerator.py +%%DATADIR%%/contrib/hod/hodlib/Common/hodsvc.py +%%DATADIR%%/contrib/hod/hodlib/Common/logger.py +%%DATADIR%%/contrib/hod/hodlib/Common/miniHTMLParser.py +%%DATADIR%%/contrib/hod/hodlib/Common/nodepoolutil.py +%%DATADIR%%/contrib/hod/hodlib/Common/setup.py +%%DATADIR%%/contrib/hod/hodlib/Common/socketServers.py +%%DATADIR%%/contrib/hod/hodlib/Common/tcp.py +%%DATADIR%%/contrib/hod/hodlib/Common/threads.py +%%DATADIR%%/contrib/hod/hodlib/Common/types.py +%%DATADIR%%/contrib/hod/hodlib/Common/util.py +%%DATADIR%%/contrib/hod/hodlib/Common/xmlrpc.py +%%DATADIR%%/contrib/hod/hodlib/GridServices/__init__.py +%%DATADIR%%/contrib/hod/hodlib/GridServices/hdfs.py +%%DATADIR%%/contrib/hod/hodlib/GridServices/mapred.py +%%DATADIR%%/contrib/hod/hodlib/GridServices/service.py +%%DATADIR%%/contrib/hod/hodlib/Hod/__init__.py +%%DATADIR%%/contrib/hod/hodlib/Hod/hadoop.py +%%DATADIR%%/contrib/hod/hodlib/Hod/hod.py +%%DATADIR%%/contrib/hod/hodlib/Hod/nodePool.py +%%DATADIR%%/contrib/hod/hodlib/HodRing/__init__.py +%%DATADIR%%/contrib/hod/hodlib/HodRing/hodRing.py +%%DATADIR%%/contrib/hod/hodlib/NodePools/__init__.py +%%DATADIR%%/contrib/hod/hodlib/NodePools/torque.py +%%DATADIR%%/contrib/hod/hodlib/RingMaster/__init__.py +%%DATADIR%%/contrib/hod/hodlib/RingMaster/idleJobTracker.py +%%DATADIR%%/contrib/hod/hodlib/RingMaster/ringMaster.py +%%DATADIR%%/contrib/hod/hodlib/Schedulers/__init__.py +%%DATADIR%%/contrib/hod/hodlib/Schedulers/torque.py +%%DATADIR%%/contrib/hod/hodlib/ServiceProxy/__init__.py +%%DATADIR%%/contrib/hod/hodlib/ServiceProxy/serviceProxy.py +%%DATADIR%%/contrib/hod/hodlib/ServiceRegistry/__init__.py +%%DATADIR%%/contrib/hod/hodlib/ServiceRegistry/serviceRegistry.py +%%DATADIR%%/contrib/hod/hodlib/__init__.py +%%DATADIR%%/contrib/hod/ivy/libraries.properties +%%DATADIR%%/contrib/hod/support/checklimits.sh +%%DATADIR%%/contrib/hod/support/logcondense.py +%%DATADIR%%/contrib/hod/testing/__init__.py +%%DATADIR%%/contrib/hod/testing/helper.py +%%DATADIR%%/contrib/hod/testing/lib.py +%%DATADIR%%/contrib/hod/testing/main.py +%%DATADIR%%/contrib/hod/testing/testHadoop.py +%%DATADIR%%/contrib/hod/testing/testHod.py +%%DATADIR%%/contrib/hod/testing/testHodCleanup.py +%%DATADIR%%/contrib/hod/testing/testHodRing.py +%%DATADIR%%/contrib/hod/testing/testModule.py +%%DATADIR%%/contrib/hod/testing/testRingmasterRPCs.py +%%DATADIR%%/contrib/hod/testing/testThreads.py +%%DATADIR%%/contrib/hod/testing/testTypes.py +%%DATADIR%%/contrib/hod/testing/testUtil.py +%%DATADIR%%/contrib/hod/testing/testXmlrpc.py +%%DATADIR%%/contrib/hod/CHANGES.txt +%%DATADIR%%/contrib/hod/README +%%DATADIR%%/contrib/hod/build.xml +%%DATADIR%%/contrib/hod/config.txt +%%DATADIR%%/contrib/hod/getting_started.txt +%%DATADIR%%/contrib/hod/ivy.xml +%%DATADIR%%/contrib/index/hadoop-index-%%PORTVERSION%%.jar +%%DATADIR%%/contrib/streaming/hadoop-streaming-%%PORTVERSION%%.jar +%%DATADIR%%/lib/hadoop-thriftfs-%%PORTVERSION%%.jar +%%DATADIR%%/contrib/vaidya/bin/vaidya.sh +%%DATADIR%%/contrib/vaidya/conf/postex_diagnosis_tests.xml +%%DATADIR%%/contrib/vaidya/hadoop-vaidya-%%PORTVERSION%%.jar +%%DATADIR%%/hadoop-ant-%%PORTVERSION%%.jar +%%DATADIR%%/hadoop-core-%%PORTVERSION%%.jar +%%DATADIR%%/hadoop-test-%%PORTVERSION%%.jar +%%DATADIR%%/hadoop-tools-%%PORTVERSION%%.jar +%%DATADIR%%/lib/jdiff/hadoop_0.17.0.xml +%%DATADIR%%/lib/jdiff/hadoop_0.18.1.xml +%%DATADIR%%/lib/jdiff/hadoop_0.18.2.xml +%%DATADIR%%/lib/jdiff/hadoop_0.18.3.xml +%%DATADIR%%/lib/jdiff/hadoop_0.19.0.xml +%%DATADIR%%/lib/jdiff/hadoop_0.19.1.xml +%%DATADIR%%/lib/jdiff/hadoop_0.19.2.xml +%%DATADIR%%/lib/jdiff/hadoop_0.20.1.xml +%%DATADIR%%/lib/jdiff/hadoop_0.20.205.0.xml +%%DATADIR%%/lib/jdiff/hadoop_1.0.0.xml +%%DATADIR%%/lib/jdiff/hadoop_1.0.1.xml +%%DATADIR%%/lib/jdiff/hadoop_1.0.2.xml +%%DATADIR%%/lib/jdiff/hadoop_1.0.3.xml +%%DATADIR%%/lib/jdiff/hadoop_1.0.4.xml +%%DATADIR%%/lib/jdiff/hadoop_1.1.0.xml +%%DATADIR%%/lib/jdiff/hadoop_1.1.1.xml +%%DATADIR%%/lib/jdiff/hadoop_1.1.2.xml +%%DATADIR%%/lib/jdiff/hadoop_1.2.0.xml +%%DATADIR%%/lib/jdiff/hadoop_%%PORTVERSION%%.xml +%%DATADIR%%/lib/jsp-2.1/jsp-2.1.jar +%%DATADIR%%/lib/jsp-2.1/jsp-api-2.1.jar +%%DATADIR%%/lib/native/Linux-amd64-64/libhadoop.a +%%DATADIR%%/lib/native/Linux-amd64-64/libhadoop.la +%%DATADIR%%/lib/native/Linux-amd64-64/libhadoop.so +%%DATADIR%%/lib/native/Linux-amd64-64/libhadoop.so.1 +%%DATADIR%%/lib/native/Linux-amd64-64/libhadoop.so.1.0.0 +%%DATADIR%%/lib/native/Linux-i386-32/libhadoop.a +%%DATADIR%%/lib/native/Linux-i386-32/libhadoop.la +%%DATADIR%%/lib/native/Linux-i386-32/libhadoop.so +%%DATADIR%%/lib/native/Linux-i386-32/libhadoop.so.1 +%%DATADIR%%/lib/native/Linux-i386-32/libhadoop.so.1.0.0 +%%DATADIR%%/lib/native/%%HADOOP_ARCH%%/libhadoop.a +%%DATADIR%%/lib/native/%%HADOOP_ARCH%%/libhadoop.la +%%DATADIR%%/lib/native/%%HADOOP_ARCH%%/libhadoop.so +%%DATADIR%%/lib/native/%%HADOOP_ARCH%%/libhadoop.so.1 +%%DATADIR%%/lib/asm-3.2.jar +%%DATADIR%%/lib/aspectjrt-1.6.11.jar +%%DATADIR%%/lib/aspectjtools-1.6.11.jar +%%DATADIR%%/lib/commons-beanutils-1.7.0.jar +%%DATADIR%%/lib/commons-beanutils-core-1.8.0.jar +%%DATADIR%%/lib/commons-cli-1.2.jar +%%DATADIR%%/lib/commons-codec-1.4.jar +%%DATADIR%%/lib/commons-collections-3.2.1.jar +%%DATADIR%%/lib/commons-configuration-1.6.jar +%%DATADIR%%/lib/commons-daemon-1.0.1.jar +%%DATADIR%%/lib/commons-digester-1.8.jar +%%DATADIR%%/lib/commons-el-1.0.jar +%%DATADIR%%/lib/commons-httpclient-3.0.1.jar +%%DATADIR%%/lib/commons-io-2.1.jar +%%DATADIR%%/lib/commons-lang-2.4.jar +%%DATADIR%%/lib/commons-logging-1.1.1.jar +%%DATADIR%%/lib/commons-logging-api-1.0.4.jar +%%DATADIR%%/lib/commons-math-2.1.jar +%%DATADIR%%/lib/commons-net-3.1.jar +%%DATADIR%%/lib/core-3.1.1.jar +%%DATADIR%%/lib/hsqldb-1.8.0.10.LICENSE.txt +%%DATADIR%%/lib/hsqldb-1.8.0.10.jar +%%DATADIR%%/lib/jackson-core-asl-1.8.8.jar +%%DATADIR%%/lib/jackson-mapper-asl-1.8.8.jar +%%DATADIR%%/lib/jasper-compiler-5.5.12.jar +%%DATADIR%%/lib/jasper-runtime-5.5.12.jar +%%DATADIR%%/lib/jdeb-0.8.jar +%%DATADIR%%/lib/jersey-core-1.8.jar +%%DATADIR%%/lib/jersey-json-1.8.jar +%%DATADIR%%/lib/jersey-server-1.8.jar +%%DATADIR%%/lib/jets3t-0.6.1.jar +%%DATADIR%%/lib/jetty-6.1.26.jar +%%DATADIR%%/lib/jetty-util-6.1.26.jar +%%DATADIR%%/lib/jsch-0.1.42.jar +%%DATADIR%%/lib/junit-4.5.jar +%%DATADIR%%/lib/kfs-0.2.2.jar +%%DATADIR%%/lib/kfs-0.2.LICENSE.txt +%%DATADIR%%/lib/log4j-1.2.15.jar +%%DATADIR%%/lib/mockito-all-1.8.5.jar +%%DATADIR%%/lib/oro-2.0.8.jar +%%DATADIR%%/lib/servlet-api-2.5-20081211.jar +%%DATADIR%%/lib/slf4j-api-1.4.3.jar +%%DATADIR%%/lib/slf4j-log4j12-1.4.3.jar +%%DATADIR%%/lib/xmlenc-0.52.jar +%%DATADIR%%/webapps/task/index.html +%%DATADIR%%/webapps/task/WEB-INF/web.xml +%%DATADIR%%/webapps/static/sorttable.js +%%DATADIR%%/webapps/static/jobtracker.js +%%DATADIR%%/webapps/static/jobconf.xsl +%%DATADIR%%/webapps/static/hadoop.css +%%DATADIR%%/webapps/static/hadoop-logo.jpg +%%DATADIR%%/webapps/secondary/index.html +%%DATADIR%%/webapps/secondary/WEB-INF/web.xml +%%DATADIR%%/webapps/job/taskstatshistory.jsp +%%DATADIR%%/webapps/job/taskstats.jsp +%%DATADIR%%/webapps/job/taskdetailshistory.jsp +%%DATADIR%%/webapps/job/taskdetails.jsp +%%DATADIR%%/webapps/job/machines.jsp +%%DATADIR%%/webapps/job/loadhistory.jsp +%%DATADIR%%/webapps/job/legacyjobhistory.jsp +%%DATADIR%%/webapps/job/jobtracker.jsp +%%DATADIR%%/webapps/job/jobtaskshistory.jsp +%%DATADIR%%/webapps/job/jobtasks.jsp +%%DATADIR%%/webapps/job/jobqueue_details.jsp +%%DATADIR%%/webapps/job/jobhistoryhome.jsp +%%DATADIR%%/webapps/job/jobhistory.jsp +%%DATADIR%%/webapps/job/jobfailures.jsp +%%DATADIR%%/webapps/job/jobdetailshistory.jsp +%%DATADIR%%/webapps/job/jobdetails.jsp +%%DATADIR%%/webapps/job/jobconf_history.jsp +%%DATADIR%%/webapps/job/jobconf.jsp +%%DATADIR%%/webapps/job/jobblacklistedtrackers.jsp +%%DATADIR%%/webapps/job/job_authorization_error.jsp +%%DATADIR%%/webapps/job/index.html +%%DATADIR%%/webapps/job/gethistory.jsp +%%DATADIR%%/webapps/job/analysejobhistory.jsp +%%DATADIR%%/webapps/job/WEB-INF/web.xml *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***