From 20e51e472b7f93f68ce7ef015aa88ff0ba82dee0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 21 Jun 2019 17:16:39 +0200 Subject: [PATCH] xbps: merge patch from master. Fixes the build issue seen in buildbot, returning ENXIO. --- srcpkgs/xbps/patches/2f1fd70a4e.patch | 22 ++++++++++++++++++++++ srcpkgs/xbps/template | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xbps/patches/2f1fd70a4e.patch diff --git a/srcpkgs/xbps/patches/2f1fd70a4e.patch b/srcpkgs/xbps/patches/2f1fd70a4e.patch new file mode 100644 index 0000000000..80b539c8e6 --- /dev/null +++ b/srcpkgs/xbps/patches/2f1fd70a4e.patch @@ -0,0 +1,22 @@ +commit 2f1fd70a4e9ec65dc83a4d98dba1b3fc2be9c6ce +Author: Juan RP +Date: Fri Jun 21 17:13:06 2019 +0200 + + xbps_transaction_prepare: initialize trans dict! + + ... otherwise it will always return ENXIO + +diff --git a/lib/transaction_prepare.c b/lib/transaction_prepare.c +index 9921127d..79a68f2a 100644 +--- lib/transaction_prepare.c ++++ lib/transaction_prepare.c +@@ -279,6 +279,9 @@ xbps_transaction_prepare(struct xbps_handle *xhp) + unsigned int i, cnt; + int rv = 0; + ++ if ((rv = xbps_transaction_init(xhp)) != 0) ++ return rv; ++ + if (xhp->transd == NULL) + return ENXIO; + diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index f5da7e85a4..1e2b2ccebf 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.55 -revision=1 +revision=2 bootstrap=yes build_style=configure short_desc="XBPS package system utilities"