diff options
author | Jose-Luis Rivas <ghostbar@riseup.net> | 2016-02-22 09:47:00 -0500 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2016-02-22 14:49:09 +0000 |
commit | 9066cd752ccf63068d6ea900c29b14ac61868b8b (patch) | |
tree | 7efa3ac0ebdb9cb8c88d185e81d42045fb2ebb21 | |
parent | eab4343d4108ba85530b8141ae3fe0a2242cd72b (diff) | |
download | alpine_aports-9066cd752ccf63068d6ea900c29b14ac61868b8b.tar.bz2 alpine_aports-9066cd752ccf63068d6ea900c29b14ac61868b8b.tar.xz alpine_aports-9066cd752ccf63068d6ea900c29b14ac61868b8b.zip |
main/nodejs: upgrade to 4.3.1
- delete issue-4221.patch, it was applied in commit
761cf2bf6a67307bb234a10b10fccdfd7893575c.
- change source to use https url.
-rw-r--r-- | main/nodejs/APKBUILD | 16 | ||||
-rw-r--r-- | main/nodejs/issue-4221.patch | 14 |
2 files changed, 6 insertions, 24 deletions
diff --git a/main/nodejs/APKBUILD b/main/nodejs/APKBUILD index ba367a1292..6945328801 100644 --- a/main/nodejs/APKBUILD +++ b/main/nodejs/APKBUILD | |||
@@ -1,7 +1,8 @@ | |||
1 | # Contributor: William Pitcock <nenolod@dereferenced.org> | 1 | # Contributor: William Pitcock <nenolod@dereferenced.org> |
2 | # Contributor: Jose-Luis Rivas <ghostbar@riseup.net> | ||
2 | # Maintainer: Eivind Uggedal <eivind@uggedal.com> | 3 | # Maintainer: Eivind Uggedal <eivind@uggedal.com> |
3 | pkgname=nodejs | 4 | pkgname=nodejs |
4 | pkgver=4.3.0 | 5 | pkgver=4.3.1 |
5 | pkgrel=0 | 6 | pkgrel=0 |
6 | pkgdesc='Evented I/O for V8 javascript' | 7 | pkgdesc='Evented I/O for V8 javascript' |
7 | url='http://nodejs.org/' | 8 | url='http://nodejs.org/' |
@@ -11,8 +12,7 @@ license='MIT' | |||
11 | makedepends="$depends_dev python openssl-dev zlib-dev libuv-dev | 12 | makedepends="$depends_dev python openssl-dev zlib-dev libuv-dev |
12 | linux-headers paxmark binutils-gold" | 13 | linux-headers paxmark binutils-gold" |
13 | subpackages="$pkgname-dev $pkgname-doc" | 14 | subpackages="$pkgname-dev $pkgname-doc" |
14 | source="http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz | 15 | source="https://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz" |
15 | issue-4221.patch" | ||
16 | _builddir="$srcdir"/node-v$pkgver | 16 | _builddir="$srcdir"/node-v$pkgver |
17 | 17 | ||
18 | prepare() { | 18 | prepare() { |
@@ -52,10 +52,6 @@ package() { | |||
52 | rm -r "$pkgdir"/usr/lib/node_modules/npm/$d || return 1 | 52 | rm -r "$pkgdir"/usr/lib/node_modules/npm/$d || return 1 |
53 | done | 53 | done |
54 | } | 54 | } |
55 | 55 | md5sums="d4eaaa7c139f13fc0168d9b5fbe13a0b node-v4.3.1.tar.gz" | |
56 | md5sums="1134e19fba49fe1d1dc0fb4e11a4ccbd node-v4.3.0.tar.gz | 56 | sha256sums="61e2d58e861b6c9dbf0ac7624b718198cbd59b88a9de31a39a05de95a32eee73 node-v4.3.1.tar.gz" |
57 | d5e343fc9d1da1718ec15280b290b4a1 issue-4221.patch" | 57 | sha512sums="156bee1237038a6d6029f96dba41e8673f8c2cce234b86a4197eb700b52e64bc8315f40fc9f321392ea21155216f944642dc7a35b2104a5c1836087f5ebb7b8e node-v4.3.1.tar.gz" |
58 | sha256sums="18504ac6d903cd061f60a29dafcda416a078112f3404d23a7901c41a8e9706b9 node-v4.3.0.tar.gz | ||
59 | 4e241e38c96629a4d96b19c99bd9c82da86a766aa53a08f4b1bb3d90a7ec7eee issue-4221.patch" | ||
60 | sha512sums="e4e60ed6d4556190028b04be2034c49f33fb5ac82baf4c7f005704788cfbc7b9bf1ea4b75c792a96115c24b93f04d0e9d095ffcbc88d2e2863dfaae225db4836 node-v4.3.0.tar.gz | ||
61 | 36f91895bb339e0e386b4c2da9bca7eb5051083761ff66a61483fcc76b75e76b5e1a405e56ab4b39e53e3ee47d9cac5b7d949c42c1e7d919ee279fe8505dc58e issue-4221.patch" | ||
diff --git a/main/nodejs/issue-4221.patch b/main/nodejs/issue-4221.patch deleted file mode 100644 index 1e592e2337..0000000000 --- a/main/nodejs/issue-4221.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | diff --git a/src/node_crypto.cc b/src/node_crypto.cc | ||
2 | index 63d767a..1b4cc1a 100644 | ||
3 | --- a/src/node_crypto.cc | ||
4 | +++ b/src/node_crypto.cc | ||
5 | @@ -3556,8 +3556,7 @@ bool Hash::HashInit(const char* hash_type) { | ||
6 | if (md_ == nullptr) | ||
7 | return false; | ||
8 | EVP_MD_CTX_init(&mdctx_); | ||
9 | - EVP_DigestInit_ex(&mdctx_, md_, nullptr); | ||
10 | - if (0 != ERR_peek_error()) { | ||
11 | + if (EVP_DigestInit_ex(&mdctx_, md_, nullptr) <= 0) { | ||
12 | return false; | ||
13 | } | ||
14 | initialised_ = true; | ||