mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-05 19:11:57 +02:00
nodejs: remove outdated fork
This commit is contained in:
parent
16391eda15
commit
3f9aa82cab
4 changed files with 0 additions and 291 deletions
|
|
@ -1 +0,0 @@
|
|||
DIST node-v0.12.7.tar.gz 20063992 SHA256 b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d SHA512 0c9cb7542530463e7703435c8d819949785c1c6497c6d98f9854ca615fe33a62f451833e856f0159b836a698b4dee5d165fa505bad5d474f664e1533090d8606 WHIRLPOOL 647391b8c49fda868c14bd4eb3089cac139f50e710ac6b141ea82e1013c4ff7d40cdb0e88d69604d06e3bd07775876c754211a2b099685cb7353ae5708812525
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
--- src/node_constants.cc.orig 2015-07-10 06:41:19.000000000 +0800
|
||||
+++ src/node_constants.cc 2015-08-02 16:28:48.000000000 +0800
|
||||
@@ -33,11 +33,17 @@
|
||||
#include <sys/stat.h>
|
||||
|
||||
#if HAVE_OPENSSL
|
||||
-# include <openssl/ec.h>
|
||||
-# include <openssl/ssl.h>
|
||||
-# ifndef OPENSSL_NO_ENGINE
|
||||
-# include <openssl/engine.h>
|
||||
-# endif // !OPENSSL_NO_ENGINE
|
||||
+
|
||||
+#include <openssl/ssl.h>
|
||||
+
|
||||
+#ifndef OPENSSL_NO_EC
|
||||
+#include <openssl/ec.h>
|
||||
+#endif
|
||||
+
|
||||
+#ifndef OPENSSL_NO_ENGINE
|
||||
+#include <openssl/engine.h>
|
||||
+#endif // !OPENSSL_NO_ENGINE
|
||||
+
|
||||
#endif
|
||||
|
||||
namespace node {
|
||||
@@ -976,7 +982,7 @@
|
||||
NODE_DEFINE_CONSTANT(target, RSA_PKCS1_PSS_PADDING);
|
||||
#endif
|
||||
|
||||
-#if HAVE_OPENSSL
|
||||
+#ifndef OPENSSL_NO_EC
|
||||
// NOTE: These are not defines
|
||||
NODE_DEFINE_CONSTANT(target, POINT_CONVERSION_COMPRESSED);
|
||||
|
||||
--- src/node_crypto.cc.orig 2015-07-10 06:41:19.000000000 +0800
|
||||
+++ src/node_crypto.cc 2015-08-02 16:30:39.000000000 +0800
|
||||
@@ -275,7 +275,9 @@
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "addCRL", SecureContext::AddCRL);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "addRootCerts", SecureContext::AddRootCerts);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "setCiphers", SecureContext::SetCiphers);
|
||||
+#ifndef OPENSSL_NO_EC
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "setECDHCurve", SecureContext::SetECDHCurve);
|
||||
+#endif
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "setDHParam", SecureContext::SetDHParam);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "setOptions", SecureContext::SetOptions);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "setSessionIdContext",
|
||||
@@ -741,7 +743,7 @@
|
||||
SSL_CTX_set_cipher_list(sc->ctx_, *ciphers);
|
||||
}
|
||||
|
||||
-
|
||||
+#ifndef OPENSSL_NO_EC
|
||||
void SecureContext::SetECDHCurve(const FunctionCallbackInfo<Value>& args) {
|
||||
HandleScope scope(args.GetIsolate());
|
||||
|
||||
@@ -768,7 +770,7 @@
|
||||
|
||||
EC_KEY_free(ecdh);
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
|
||||
void SecureContext::SetDHParam(const FunctionCallbackInfo<Value>& args) {
|
||||
HandleScope scope(args.GetIsolate());
|
||||
@@ -4152,7 +4154,7 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
-
|
||||
+#ifndef OPENSSL_NO_EC
|
||||
void ECDH::Initialize(Environment* env, Handle<Object> target) {
|
||||
HandleScope scope(env->isolate());
|
||||
|
||||
@@ -4369,6 +4371,7 @@
|
||||
if (!r)
|
||||
return env->ThrowError("Failed to convert BN to a private key");
|
||||
}
|
||||
+#endif // OPENSSL_NO_EC
|
||||
|
||||
|
||||
class PBKDF2Request : public AsyncWrap {
|
||||
@@ -5142,7 +5145,9 @@
|
||||
Connection::Initialize(env, target);
|
||||
CipherBase::Initialize(env, target);
|
||||
DiffieHellman::Initialize(env, target);
|
||||
+#ifndef OPENSSL_NO_EC
|
||||
ECDH::Initialize(env, target);
|
||||
+#endif
|
||||
Hmac::Initialize(env, target);
|
||||
Hash::Initialize(env, target);
|
||||
Sign::Initialize(env, target);
|
||||
--- src/node_crypto.h.orig 2015-07-10 06:41:19.000000000 +0800
|
||||
+++ src/node_crypto.h 2015-08-02 16:14:31.000000000 +0800
|
||||
@@ -39,8 +39,15 @@
|
||||
#include "v8.h"
|
||||
|
||||
#include <openssl/ssl.h>
|
||||
+
|
||||
+#ifndef OPENSSL_NO_EC
|
||||
#include <openssl/ec.h>
|
||||
+#endif
|
||||
+
|
||||
+#ifndef OPENSSL_NO_ECDH
|
||||
#include <openssl/ecdh.h>
|
||||
+#endif
|
||||
+
|
||||
#ifndef OPENSSL_NO_ENGINE
|
||||
# include <openssl/engine.h>
|
||||
#endif // !OPENSSL_NO_ENGINE
|
||||
@@ -98,7 +105,9 @@
|
||||
static void AddCRL(const v8::FunctionCallbackInfo<v8::Value>& args);
|
||||
static void AddRootCerts(const v8::FunctionCallbackInfo<v8::Value>& args);
|
||||
static void SetCiphers(const v8::FunctionCallbackInfo<v8::Value>& args);
|
||||
+#ifndef OPENSSL_NO_EC
|
||||
static void SetECDHCurve(const v8::FunctionCallbackInfo<v8::Value>& args);
|
||||
+#endif
|
||||
static void SetDHParam(const v8::FunctionCallbackInfo<v8::Value>& args);
|
||||
static void SetOptions(const v8::FunctionCallbackInfo<v8::Value>& args);
|
||||
static void SetSessionIdContext(
|
||||
@@ -646,6 +655,7 @@
|
||||
DH* dh;
|
||||
};
|
||||
|
||||
+#ifndef OPENSSL_NO_EC
|
||||
class ECDH : public BaseObject {
|
||||
public:
|
||||
~ECDH() {
|
||||
@@ -681,6 +691,7 @@
|
||||
EC_KEY* key_;
|
||||
const EC_GROUP* group_;
|
||||
};
|
||||
+#endif
|
||||
|
||||
class Certificate : public AsyncWrap {
|
||||
public:
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
--- src/node.cc.orig 2015-07-10 06:41:19.000000000 +0800
|
||||
+++ src/node.cc 2015-07-31 17:33:25.035074443 +0800
|
||||
@@ -2934,8 +2934,10 @@
|
||||
" present.\n"
|
||||
#endif
|
||||
#endif
|
||||
+#if HAVE_OPENSSL
|
||||
" --enable-ssl2 enable ssl2\n"
|
||||
" --enable-ssl3 enable ssl3\n"
|
||||
+#endif // HAVE_OPENSSL
|
||||
"\n"
|
||||
"Environment variables:\n"
|
||||
#ifdef _WIN32
|
||||
@@ -3003,10 +3005,12 @@
|
||||
} else if (strcmp(arg, "--version") == 0 || strcmp(arg, "-v") == 0) {
|
||||
printf("%s\n", NODE_VERSION);
|
||||
exit(0);
|
||||
+#if HAVE_OPENSSL
|
||||
} else if (strcmp(arg, "--enable-ssl2") == 0) {
|
||||
SSL2_ENABLE = true;
|
||||
} else if (strcmp(arg, "--enable-ssl3") == 0) {
|
||||
SSL3_ENABLE = true;
|
||||
+#endif // HAVE_OPENSSL
|
||||
} else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
|
||||
PrintHelp();
|
||||
exit(0);
|
||||
|
|
@ -1,129 +0,0 @@
|
|||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.12.7.ebuild,v 1.1 2015/07/12 00:25:09 patrick Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
# has known failures. sigh.
|
||||
RESTRICT="test"
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="threads"
|
||||
|
||||
inherit pax-utils python-single-r1 toolchain-funcs eutils
|
||||
|
||||
DESCRIPTION="Evented IO for V8 Javascript"
|
||||
HOMEPAGE="http://nodejs.org/"
|
||||
SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
|
||||
IUSE="debug icu +npm +snapshot +ssl"
|
||||
|
||||
RDEPEND="icu? ( dev-libs/icu )
|
||||
${PYTHON_DEPS}
|
||||
ssl? ( dev-libs/openssl:0= )
|
||||
>=net-libs/http-parser-2.3
|
||||
>=dev-libs/libuv-1.4.2"
|
||||
DEPEND="${RDEPEND}
|
||||
!!net-libs/iojs"
|
||||
|
||||
S="${WORKDIR}/node-v${PV}"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
src_prepare() {
|
||||
#https://github.com/joyent/node/pull/25461
|
||||
epatch "${FILESDIR}"/"${P}"_ssl.patch
|
||||
#make ECDH optional
|
||||
epatch "${FILESDIR}"/"${P}"_bindist.patch
|
||||
|
||||
tc-export CC CXX PKG_CONFIG
|
||||
export V=1 # Verbose build
|
||||
export BUILDTYPE=Release
|
||||
|
||||
# fix compilation on Darwin
|
||||
# http://code.google.com/p/gyp/issues/detail?id=260
|
||||
sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
|
||||
|
||||
# make sure we use python2.* while using gyp
|
||||
sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
|
||||
sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
|
||||
|
||||
# less verbose install output (stating the same as portage, basically)
|
||||
sed -i -e "/print/d" tools/install.py || die
|
||||
|
||||
# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
|
||||
local LIBDIR=$(get_libdir)
|
||||
sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
|
||||
sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
|
||||
sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
|
||||
|
||||
# debug builds. change install path, remove optimisations and override buildtype
|
||||
if use debug; then
|
||||
sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
|
||||
BUILDTYPE=Debug
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
local myarch=""
|
||||
use debug && myconf+=( --debug )
|
||||
use icu && myconf+=( --with-intl=system-icu )
|
||||
use npm || myconf+=( --without-npm )
|
||||
use snapshot || myconf+=( --without-snapshot )
|
||||
use ssl || myconf+=( --without-ssl )
|
||||
|
||||
case ${ABI} in
|
||||
x86) myarch="ia32";;
|
||||
amd64) myarch="x64";;
|
||||
arm) myarch="arm";;
|
||||
*) die "Unrecognized ARCH ${ARCH}";;
|
||||
esac
|
||||
|
||||
"${PYTHON}" configure \
|
||||
--prefix="${EPREFIX}"/usr \
|
||||
--dest-cpu=${myarch} \
|
||||
--shared-openssl \
|
||||
--shared-libuv \
|
||||
--shared-http-parser \
|
||||
--shared-zlib \
|
||||
--without-dtrace \
|
||||
"${myconf[@]}" || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C out mksnapshot
|
||||
pax-mark m "out/${BUILDTYPE}/mksnapshot"
|
||||
emake -C out
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local LIBDIR="${ED}/usr/$(get_libdir)"
|
||||
emake install DESTDIR="${ED}" PREFIX=/usr
|
||||
use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
|
||||
rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
|
||||
find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete
|
||||
|
||||
# set up a symlink structure that npm expects..
|
||||
dodir /usr/include/node/deps/{v8,uv}
|
||||
dosym . /usr/include/node/src
|
||||
for var in deps/{uv,v8}/include; do
|
||||
dosym ../.. /usr/include/node/${var}
|
||||
done
|
||||
|
||||
pax-mark -m "${ED}"/usr/bin/node
|
||||
}
|
||||
|
||||
src_test() {
|
||||
declare -xl TESTTYPE="${BUILDTYPE}"
|
||||
"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message simple || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "When using node-gyp to install native modules, you can avoid"
|
||||
einfo "having to download the full tarball by doing the following:"
|
||||
einfo ""
|
||||
einfo "node-gyp --nodedir /usr/include/node <command>"
|
||||
}
|
||||
Loading…
Reference in a new issue