From a0e2c56aa811457ee91c60d81a351e20150f6110 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Sat, 25 Oct 2014 23:27:52 +0200 Subject: [PATCH 1/2] Update Node.js to v0.10.33; remove unneeded openssl.gyp patch --- cross/node/Makefile | 2 +- cross/node/digests | 6 +++--- cross/node/patches/openssl.gyp.patch | 14 -------------- spk/node/Makefile | 4 ++-- 4 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 cross/node/patches/openssl.gyp.patch diff --git a/cross/node/Makefile b/cross/node/Makefile index bdb04e9316f..67a76d05ee5 100644 --- a/cross/node/Makefile +++ b/cross/node/Makefile @@ -1,5 +1,5 @@ PKG_NAME = node -PKG_VERS = 0.10.31 +PKG_VERS = 0.10.33 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = http://nodejs.org/dist/v$(PKG_VERS)/ diff --git a/cross/node/digests b/cross/node/digests index 5902e5e0ecf..915159da5db 100644 --- a/cross/node/digests +++ b/cross/node/digests @@ -1,3 +1,3 @@ -node-v0.10.31.tar.gz SHA1 80f2160b0525763b557742aa73d8dacf1a71e53c -node-v0.10.31.tar.gz SHA256 06c781718a674dfdfb59d646b2629a46af2644bdbf52534fab8d4a0fe34c21f1 -node-v0.10.31.tar.gz MD5 1b65fe749f8e542a56a71af2b8c3a74a +node-v0.10.33.tar.gz SHA1 69aeeade5fef622c3150cfc2b4a8f70eea1ef1ec +node-v0.10.33.tar.gz SHA256 75dc26c33144e6d0dc91cb0d68aaf0570ed0a7e4b0c35f3a7a726b500edd081e +node-v0.10.33.tar.gz MD5 626ca8a4f8fec4df49c78ed53d46f1f7 diff --git a/cross/node/patches/openssl.gyp.patch b/cross/node/patches/openssl.gyp.patch deleted file mode 100644 index a85f2865a29..00000000000 --- a/cross/node/patches/openssl.gyp.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- deps/openssl/openssl.gyp.orig 2014-08-19 17:19:52.000000000 +0200 -+++ deps/openssl/openssl.gyp 2014-08-20 21:39:55.742348191 +0200 -@@ -939,7 +939,10 @@ - ], - }], - ['target_arch=="arm"', { -- 'sources': ['openssl/crypto/armcap.c'], -+ 'sources': [ -+ 'openssl/crypto/armcap.c', -+ 'openssl/crypto/armv4cpuid.S', -+ ], - }], - ], - 'include_dirs': [ diff --git a/spk/node/Makefile b/spk/node/Makefile index 123895b2ac7..0e1d995383d 100644 --- a/spk/node/Makefile +++ b/spk/node/Makefile @@ -1,6 +1,6 @@ SPK_NAME = node -SPK_VERS = 0.10.31 -SPK_REV = 2 +SPK_VERS = 0.10.33 +SPK_REV = 1 SPK_ICON = src/nodejs.png DEPENDS = cross/$(SPK_NAME) From 50ee17e439e5ec1bc66f34c17ac9a8e469c6abf8 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Sun, 26 Oct 2014 15:29:10 +0100 Subject: [PATCH 2/2] Remove unneeded patches; set SPK_REV and CHANGELOG --- cross/node/patches/cryptlib.c.patch | 18 ------------------ cross/node/patches/mem_clr.c.patch | 15 --------------- spk/node/Makefile | 3 ++- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 cross/node/patches/cryptlib.c.patch delete mode 100644 cross/node/patches/mem_clr.c.patch diff --git a/cross/node/patches/cryptlib.c.patch b/cross/node/patches/cryptlib.c.patch deleted file mode 100644 index c7f562d049b..00000000000 --- a/cross/node/patches/cryptlib.c.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- deps/openssl/openssl/crypto/cryptlib.c.orig 2014-08-20 21:42:52.066466954 +0200 -+++ deps/openssl/openssl/crypto/cryptlib.c 2014-08-20 21:41:49.815356685 +0200 -@@ -677,6 +677,7 @@ - return (unsigned long *)OPENSSL_ia32cap_P; - } - -+#if !defined(__arm__) - #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) - #define OPENSSL_CPUID_SETUP - #if defined(_WIN32) -@@ -722,6 +723,7 @@ - #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) - void OPENSSL_cpuid_setup(void) {} - #endif -+#endif - - #if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_WINDLL) - #ifdef __CYGWIN__ diff --git a/cross/node/patches/mem_clr.c.patch b/cross/node/patches/mem_clr.c.patch deleted file mode 100644 index f37a3080de8..00000000000 --- a/cross/node/patches/mem_clr.c.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- deps/openssl/openssl/crypto/mem_clr.c.orig 2014-08-19 17:19:52.000000000 +0200 -+++ deps/openssl/openssl/crypto/mem_clr.c 2014-08-20 21:44:34.877847400 +0200 -@@ -61,6 +61,7 @@ - - unsigned char cleanse_ctr = 0; - -+#if !defined(__arm__) - void OPENSSL_cleanse(void *ptr, size_t len) - { - unsigned char *p = ptr; -@@ -75,3 +76,4 @@ - ctr += (63 + (size_t)p); - cleanse_ctr = (unsigned char)ctr; - } -+#endif diff --git a/spk/node/Makefile b/spk/node/Makefile index 0e1d995383d..9ad7098ec57 100644 --- a/spk/node/Makefile +++ b/spk/node/Makefile @@ -1,6 +1,6 @@ SPK_NAME = node SPK_VERS = 0.10.33 -SPK_REV = 1 +SPK_REV = 3 SPK_ICON = src/nodejs.png DEPENDS = cross/$(SPK_NAME) @@ -9,6 +9,7 @@ MAINTAINER = SynoCommunity DESCRIPTION = Node.js is a platform built on Chrome\'s JavaScript runtime for easily building fast, scalable network applications. STARTABLE = no DISPLAY_NAME = Node.js +CHANGELOG = Update to Node.js v0.10.33 HOMEPAGE = http://nodejs.org/ LICENSE = MIT