From d082f1390c08bad9cc6ceb6c96039fc6aa8dd3d1 Mon Sep 17 00:00:00 2001
From: Jörg Krause <joerg.krause@embedded.rocks>
Date: Sun, 12 Jul 2015 10:12:57 +0200
Subject: package/nodejs: version bump to 0.12.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...4-fix-build-error-without-OpenSSL-support.patch | 46 ----------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch

(limited to 'package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch')

diff --git a/package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch b/package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch
deleted file mode 100644
index ccb29b1193..0000000000
--- a/package/nodejs/0.12.6/0004-fix-build-error-without-OpenSSL-support.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6bfa497dceb83de5257c64da59fbcf6a32d83305 Mon Sep 17 00:00:00 2001
-From: Martin Bark <martin@barkynet.com>
-Date: Tue, 30 Jun 2015 09:45:07 +0100
-Subject: [PATCH 4/4] fix build error without OpenSSL support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jörg Krause <jkrause@posteo.de>
-[Martin: adapt to 0.12.5]
-Signed-off-by: Martin Bark <martin@barkynet.com>
----
- src/node.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/node.cc b/src/node.cc
-index e669706..d43b791 100644
---- a/src/node.cc
-+++ b/src/node.cc
-@@ -2934,8 +2934,10 @@ static void PrintHelp() {
-          "                       present.\n"
- #endif
- #endif
-+#if HAVE_OPENSSL
-          "  --enable-ssl2        enable ssl2\n"
-          "  --enable-ssl3        enable ssl3\n"
-+#endif
-          "\n"
-          "Environment variables:\n"
- #ifdef _WIN32
-@@ -3003,10 +3005,12 @@ static void ParseArgs(int* argc,
-     } 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
-     } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
-       PrintHelp();
-       exit(0);
--- 
-2.1.4
-
-- 
cgit v1.2.3