testing/cargo: upgrade to 0.14.0

3 files changed, 44 insertions, 47 deletions

diff --git a/testing/cargo/APKBUILD b/testing/cargo/APKBUILD
index 59ff54cc6b..58c9a3a627 100644
--- a/testing/cargo/APKBUILD
+++ b/testing/cargo/APKBUILD
@@ -1,17 +1,17 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=cargo
-pkgver=0.12.0
-pkgrel=1
+pkgver=0.14.0
+pkgrel=0
 pkgdesc="The Rust package manager"
 url="https://crates.io"
 arch="x86_64"
 license="MIT ASL-2.0"
 depends="rust"
-makedepends="cmake curl-dev libssh2-dev libressl-dev python2 zlib-dev"
+makedepends="cmake curl-dev libgit2-dev libssh2-dev libressl-dev python2 zlib-dev"
 subpackages="$pkgname-doc
-	$pkgname-bash-completion:bashcomp
-	$pkgname-zsh-completion:zshcomp"
+	$pkgname-bash-completion:bashcomp:noarch
+	$pkgname-zsh-completion:zshcomp:noarch"
 
 # XXX: Cargo is self-hosted, so you need cargo to build cargo (ugh).
 # The problem is that Rust doesn't provide prebuilt cargo for musl yet. Thus
@@ -19,38 +19,35 @@ subpackages="$pkgname-doc
 # to my server. We're gonna replace it once Rust start providing prebuilt
 # binary for musl.
 # TODO: Implement some support for verifying crates fetched by cargo!
-source="$pkgname-$pkgver.tar.gz::https://github.com/rust-lang/cargo/archive/$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/rust-lang/$pkgname/archive/$pkgver.tar.gz
 	https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz
-	musl-NFS_SUPER_MAGICK.patch
-	"
+	fix-release-num.patch"
 builddir="$srcdir/$pkgname-$pkgver"
 
-_CTARGET="$CARCH-unknown-linux-musl"
-
-prepare() {
-	default_prepare || return 1
-
-	cd "$builddir"
-	_mv "$srcdir"/cargo-*-$_CTARGET/cargo/* target/snapshot
-}
+_ctarget="$CARCH-unknown-linux-musl"
 
 build() {
 	export CARGO_HOME="$builddir/.cargo"
+	# Convince libgit2-sys to use the distro libgit2.
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
 
 	cd "$builddir"
-	./configure && make VERBOSE=1
+	./configure \
+		--prefix=/usr \
+		--local-cargo="$srcdir/cargo-nightly-$_ctarget/cargo/bin/cargo" \
+		|| return 1
+	make VERBOSE=1
 }
 
 package() {
 	cd "$builddir"
 
-	make prepare-image-$_CTARGET IMGDIR_$_CTARGET="$pkgdir/usr"
+	make prepare-image-$_ctarget IMGDIR_$_ctarget="$pkgdir/usr"
 }
 
 bashcomp() {
 	pkgdesc="Bash completions for $pkgname"
 	depends=""
-	arch="noarch"
 	install_if="$pkgname=$pkgver-r$pkgrel bash"
 
 	_mv "$pkgdir"/usr/etc/bash_completion.d/* \
@@ -63,7 +60,6 @@ bashcomp() {
 zshcomp() {
 	pkgdesc="ZSH completions for $pkgname"
 	depends=""
-	arch="noarch"
 	install_if="$pkgname=$pkgver-r$pkgrel zsh"
 
 	_mv "$pkgdir"/usr/share/zsh "$subpkgdir"/usr/share/ || return 1
@@ -76,12 +72,12 @@ _mv() {
 	mv $@
 }
 
-md5sums="2eac183921fcf2ea1e5eda71b4840179  cargo-0.12.0.tar.gz
+md5sums="d789a7785e37a1f299b24bc4b57f98ff  cargo-0.14.0.tar.gz
 79f81ecfa861f4d97a3b9235e66ba594  cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz
-284d4477b72157e5edb3b27f7045ab5e  musl-NFS_SUPER_MAGICK.patch"
-sha256sums="4080d76b56b8202f7df271b4bb7d7d22abea5ff8c261aef42e6e5d248ca5972b  cargo-0.12.0.tar.gz
+fe8c3891c23626882b2380e32450413d  fix-release-num.patch"
+sha256sums="90ec0e644586959f62e6e34e649ba57db6f74aa37b89e90972f817c49b187531  cargo-0.14.0.tar.gz
 587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9  cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz
-43a348ad5ef2830d109ac4a1c759b03f009281b58b4b8c1f3f6c463316c69fc8  musl-NFS_SUPER_MAGICK.patch"
-sha512sums="6fba348b068c07d49a6a263f143b31c3dff1e0aa399b90193830ad1823a3c07c5097fb39ff09fcc7713e78e85cfa1b5d8825db75055c49e2c3237fe4bffad3bc  cargo-0.12.0.tar.gz
+3fa15aa38a1d6c0a8f1b9a1361197faa6c7de79d9e38097b38017cb352098339  fix-release-num.patch"
+sha512sums="dcd6857f256f1b4cd4d0dfedbb7fceedadcf3ecbe92014f58ff3e668870624d5a1cddda1c4b2653b6ec713c6aef4810760e112e589b6eba81bba9692356acb4f  cargo-0.14.0.tar.gz
 17838355ff6d87165aa0f61bd01f48c58a426c069bba7c3852d016e1836666bfafe2609c323a0409fc8530ad27fb3ad5989d8cee033633e38b07fefa670597d5  cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz
-ab70985df7d32b6e82af806986ecf6ba22939d27b9d7abdd31e5c35d2ead668c8f56f2c53c59d86843c762fd43856cc22c57e3373cb746519dc68937bcdb86dd  musl-NFS_SUPER_MAGICK.patch"
+2db1c0870d20a6cfdff863a17180d960e2891e3cfd0ff565d1d1494eaeacfb553e2d1374cdc626f4ce5bc7c2a1c11ab99ae5462d8c3b44716a0f50f7b2b355fd  fix-release-num.patch"
diff --git a/testing/cargo/fix-release-num.patch b/testing/cargo/fix-release-num.patch
new file mode 100644
index 0000000000..9c23495410
--- /dev/null
+++ b/testing/cargo/fix-release-num.patch
@@ -0,0 +1,22 @@
+From e035d532bf93b597216fcd11c99f2b8b6ba6eac1 Mon Sep 17 00:00:00 2001
+From: Alex Crichton <alex@alexcrichton.com>
+Date: Fri, 4 Nov 2016 15:44:46 -0700
+Subject: [PATCH] Update makefile to 0.14.0
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 98d5e91c8053..08dc61626ee1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,4 +1,4 @@
+-CFG_RELEASE_NUM=0.13.0
++CFG_RELEASE_NUM=0.14.0
+ CFG_RELEASE_LABEL=
+ 
+ OPENSSL_VERS=1.0.2j
+-- 
+1.8.3.1
+
diff --git a/testing/cargo/musl-NFS_SUPER_MAGICK.patch b/testing/cargo/musl-NFS_SUPER_MAGICK.patch
deleted file mode 100644
index 415766ad91..0000000000
--- a/testing/cargo/musl-NFS_SUPER_MAGICK.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/rust-lang/cargo/issues/2937
---- a/src/cargo/util/flock.rs
-+++ b/src/cargo/util/flock.rs
-@@ -282,7 +282,7 @@
-         human(format!("failed to lock file: {}", path.display()))
-     });
- 
--    #[cfg(target_os = "linux")]
-+    #[cfg(all(target_os = "linux", not(target_env = "musl")))]
-     fn is_on_nfs_mount(path: &Path) -> bool {
-         use std::ffi::CString;
-         use std::mem;
-@@ -302,7 +302,7 @@
-         }
-     }
- 
--    #[cfg(not(target_os = "linux"))]
-+    #[cfg(any(not(target_os = "linux"), target_env = "musl"))]
-     fn is_on_nfs_mount(_path: &Path) -> bool {
-         false
-     }