From owner-svn-ports-all@FreeBSD.ORG Sat May 16 17:02:38 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BF4CDA86; Sat, 16 May 2015 17:02:38 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 91C7D1C11; Sat, 16 May 2015 17:02:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4GH2cqW080385; Sat, 16 May 2015 17:02:38 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4GH2cmZ080382; Sat, 16 May 2015 17:02:38 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201505161702.t4GH2cmZ080382@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 16 May 2015 17:02:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386559 - in head/www/npm: . 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2015 17:02:39 -0000 Author: sunpoet Date: Sat May 16 17:02:37 2015 New Revision: 386559 URL: https://svnweb.freebsd.org/changeset/ports/386559 Log: - Revert r386459 - Add workaround for i386 to deal with kernel bug 178881 [1] (PR/178881: getifaddrs(3) does not report IPv6 addresses properly in 32-bit compatibility mode) PR: 198350 [1] Submitted by: Marcin Cieslak [1] Thanks to: adamw, bdrewery MFH: 2015Q2 Added: head/www/npm/files/ head/www/npm/files/extra-patch-bug-178881 (contents, props changed) Modified: head/www/npm/Makefile Modified: head/www/npm/Makefile ============================================================================== --- head/www/npm/Makefile Sat May 16 16:39:16 2015 (r386558) +++ head/www/npm/Makefile Sat May 16 17:02:37 2015 (r386559) @@ -26,8 +26,6 @@ USES= cpe python:2 tar:xz MANPREFIX= ${PREFIX}/lib/node_modules/npm -ONLY_FOR_ARCHS= amd64 - CPE_VENDOR= npmjs CPE_PRODUCT= node_packaged_modules @@ -36,6 +34,13 @@ NODE_DEVEL_RUN_DEPENDS= node-devel>=0.8. NODE_RUN_DEPENDS= node>=0.8.0:${PORTSDIR}/www/node NODE010_RUN_DEPENDS= node010>=0.8.0:${PORTSDIR}/www/node010 +.include + +.if ${ARCH} == "i386" +# Workaround for kernel bug 178881 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-bug-178881 +.endif + post-patch: @${REINPLACE_CMD} -e 's|node cli.js|& --cache ${WRKDIR}/.cache|' ${WRKSRC}/Makefile @${ECHO_CMD} 'MANPATH ${PREFIX}/lib/node_modules/npm/man' > ${WRKDIR}/npm.conf @@ -81,4 +86,4 @@ maketar: do-clean @sudo ${INSTALL} -m 644 ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}.tar.xz ${DISTDIR}/ @cd ${.CURDIR}/ && ${MAKE_CMD} makesum -.include +.include Added: head/www/npm/files/extra-patch-bug-178881 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/npm/files/extra-patch-bug-178881 Sat May 16 17:02:37 2015 (r386559) @@ -0,0 +1,30 @@ +--- lib/config/defaults.js.orig 2015-05-01 04:03:19 UTC ++++ lib/config/defaults.js +@@ -316,26 +316,7 @@ exports.types = + } + + function getLocalAddresses () { +- var interfaces +- // #8094: some environments require elevated permissions to enumerate +- // interfaces, and synchronously throw EPERM when run without +- // elevated privileges +- try { +- interfaces = os.networkInterfaces() +- } catch (e) { +- interfaces = {} +- } +- +- return Object.keys(interfaces).map(function (nic) { +- return interfaces[nic].filter(function (addr) { +- return addr.family === 'IPv4' +- }) +- .map(function (addr) { +- return addr.address +- }) +- }).reduce(function (curr, next) { +- return curr.concat(next) +- }, []).concat(undefined) ++ return [ '127.0.0.1', undefined ] + } + + exports.shorthands =