~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch

[alpine-aports] [PATCH] main/nodejs: upgrade to 4.3.1

Jose-Luis Rivas <ghostbar@riseup.net>
Details
Message ID
<20160222144700.GA1947@riseup.net>
Sender timestamp
1456152420
DKIM signature
missing
Download raw message
Patch: +6 -24
- delete issue-4221.patch, it was applied in commit
  761cf2bf6a67307bb234a10b10fccdfd7893575c.
- change source to use https url.
---
 main/nodejs/APKBUILD         | 16 ++++++----------
 main/nodejs/issue-4221.patch | 14 --------------
 2 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 main/nodejs/issue-4221.patch

diff --git a/main/nodejs/APKBUILD b/main/nodejs/APKBUILD
index ba367a1..6945328 100644
--- a/main/nodejs/APKBUILD
+++ b/main/nodejs/APKBUILD
@@ -1,7 +1,8 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Contributor: Jose-Luis Rivas <ghostbar@riseup.net>
# Maintainer: Eivind Uggedal <eivind@uggedal.com>
pkgname=nodejs
pkgver=4.3.0
pkgver=4.3.1
pkgrel=0
pkgdesc='Evented I/O for V8 javascript'
url='http://nodejs.org/'
@@ -11,8 +12,7 @@ license='MIT'
makedepends="$depends_dev python openssl-dev zlib-dev libuv-dev
	linux-headers paxmark binutils-gold"
subpackages="$pkgname-dev $pkgname-doc"
source="http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz
	issue-4221.patch"
source="https://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz"
_builddir="$srcdir"/node-v$pkgver

prepare() {
@@ -52,10 +52,6 @@ package() {
		rm -r "$pkgdir"/usr/lib/node_modules/npm/$d || return 1
	done
}

md5sums="1134e19fba49fe1d1dc0fb4e11a4ccbd  node-v4.3.0.tar.gz
d5e343fc9d1da1718ec15280b290b4a1  issue-4221.patch"
sha256sums="18504ac6d903cd061f60a29dafcda416a078112f3404d23a7901c41a8e9706b9  node-v4.3.0.tar.gz
4e241e38c96629a4d96b19c99bd9c82da86a766aa53a08f4b1bb3d90a7ec7eee  issue-4221.patch"
sha512sums="e4e60ed6d4556190028b04be2034c49f33fb5ac82baf4c7f005704788cfbc7b9bf1ea4b75c792a96115c24b93f04d0e9d095ffcbc88d2e2863dfaae225db4836  node-v4.3.0.tar.gz
36f91895bb339e0e386b4c2da9bca7eb5051083761ff66a61483fcc76b75e76b5e1a405e56ab4b39e53e3ee47d9cac5b7d949c42c1e7d919ee279fe8505dc58e  issue-4221.patch"
md5sums="d4eaaa7c139f13fc0168d9b5fbe13a0b  node-v4.3.1.tar.gz"
sha256sums="61e2d58e861b6c9dbf0ac7624b718198cbd59b88a9de31a39a05de95a32eee73  node-v4.3.1.tar.gz"
sha512sums="156bee1237038a6d6029f96dba41e8673f8c2cce234b86a4197eb700b52e64bc8315f40fc9f321392ea21155216f944642dc7a35b2104a5c1836087f5ebb7b8e  node-v4.3.1.tar.gz"
diff --git a/main/nodejs/issue-4221.patch b/main/nodejs/issue-4221.patch
deleted file mode 100644
index 1e592e2..0000000
--- a/main/nodejs/issue-4221.patch
@@ -1,14 +0,0 @@
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 63d767a..1b4cc1a 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -3556,8 +3556,7 @@ bool Hash::HashInit(const char* hash_type) {
   if (md_ == nullptr)
     return false;
   EVP_MD_CTX_init(&mdctx_);
-  EVP_DigestInit_ex(&mdctx_, md_, nullptr);
-  if (0 != ERR_peek_error()) {
+  if (EVP_DigestInit_ex(&mdctx_, md_, nullptr) <= 0) {
     return false;
   }
   initialised_ = true;
-- 
2.7.1


-- 
⨳ PGP 0x13EC43EEB9AC8C43 ⨳ https://ghostbar.co
Reply to thread Export thread (mbox)