xbps: merge patch from master to fix races with multiple threads.

Crash easily triggerable with xbps-query -Ro with 8 threads.

Thanks to @chneukirchen.

srcpkgs/xbps-static/template

@@ -3,7 +3,7 @@
 # NOTE: keep this package synchronized with "srcpkgs/xbps".
 pkgname=xbps-static
 version=0.42
-revision=1
+revision=2
 build_style=configure
 short_desc="The XBPS package system utilities - static binaries"
 maintainer="Juan RP <xtraeme@gmail.com>"

srcpkgs/xbps/patches/0001-xbps_archive_fetch_xxx-avoid-races-with-multiple-thr.patch

@@ -0,0 +1,84 @@
+From 6a985190aa129f2a90a20d3f76205d092dffe76a Mon Sep 17 00:00:00 2001
+From: Juan RP <xtraeme@gmail.com>
+Date: Mon, 22 Dec 2014 18:18:20 +0100
+Subject: [PATCH] xbps_archive_fetch_xxx: avoid races with multiple threads in
+ the libfetch code.
+
+Protect our critical sections with a mutex for now, until libfetch
+is really fixed to work correctly with multiple threads.
+---
+ NEWS              |  4 ++++
+ lib/plist_fetch.c | 17 +++++++++++++++--
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/lib/plist_fetch.c b/lib/plist_fetch.c
+index 517c796..d9908ef 100644
+--- lib/plist_fetch.c
++++ lib/plist_fetch.c
+@@ -30,6 +30,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <pthread.h>
+ 
+ #include "xbps_api_impl.h"
+ 
+@@ -43,6 +44,7 @@ struct fetch_archive {
+ 	struct url *url;
+ 	struct fetchIO *fetch;
+ 	char buffer[32768];
++	pthread_mutex_t mtx;
+ };
+ 
+ static int
+@@ -50,7 +52,10 @@ fetch_archive_open(struct archive *a _unused, void *client_data)
+ {
+ 	struct fetch_archive *f = client_data;
+ 
++	pthread_mutex_lock(&f->mtx);
+ 	f->fetch = fetchGet(f->url, NULL);
++	pthread_mutex_unlock(&f->mtx);
++
+ 	if (f->fetch == NULL)
+ 		return ENOENT;
+ 
+@@ -61,10 +66,13 @@ static ssize_t
+ fetch_archive_read(struct archive *a _unused, void *client_data, const void **buf)
+ {
+ 	struct fetch_archive *f = client_data;
++	ssize_t res;
+ 
+ 	*buf = f->buffer;
+-
+-	return fetchIO_read(f->fetch, f->buffer, sizeof(f->buffer));
++	pthread_mutex_lock(&f->mtx);
++	res = fetchIO_read(f->fetch, f->buffer, sizeof(f->buffer));
++	pthread_mutex_unlock(&f->mtx);
++	return res;
+ }
+ 
+ static int
+@@ -72,8 +80,11 @@ fetch_archive_close(struct archive *a _unused, void *client_data)
+ {
+ 	struct fetch_archive *f = client_data;
+ 
++	pthread_mutex_lock(&f->mtx);
+ 	if (f->fetch != NULL)
+ 		fetchIO_close(f->fetch);
++	pthread_mutex_unlock(&f->mtx);
++	pthread_mutex_destroy(&f->mtx);
+ 	free(f);
+ 
+ 	return 0;
+@@ -90,6 +101,8 @@ open_archive_by_url(struct url *url)
+ 		return NULL;
+ 
+ 	f->url = url;
++	pthread_mutex_init(&f->mtx, NULL);
++
+ 	if ((a = archive_read_new()) == NULL) {
+ 		free(f);
+ 		return NULL;
+-- 
+2.2.1
+

srcpkgs/xbps/template

@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.42
-revision=1
+revision=2
 bootstrap=yes
 build_style=configure
 short_desc="The XBPS package system utilities"