xbps: update to 0.59.1.
This commit is contained in:
		| @@ -1,25 +0,0 @@ | ||||
| From 4d40179a8ae86f16aeea1418b6a0b58c8ed8f3d7 Mon Sep 17 00:00:00 2001 | ||||
| From: Duncan Overbruck <mail@duncano.de> | ||||
| Date: Wed, 4 Mar 2020 12:46:44 +0100 | ||||
| Subject: [PATCH] bin/xbps-install: fix regression in small transaction stats | ||||
|  | ||||
| fixes #242 | ||||
| --- | ||||
|  bin/xbps-install/transaction.c | 1 + | ||||
|  1 file changed, 1 insertion(+) | ||||
|  | ||||
| diff --git bin/xbps-install/transaction.c bin/xbps-install/transaction.c | ||||
| index ae1ddcf2..89d1b8a4 100644 | ||||
| --- bin/xbps-install/transaction.c | ||||
| +++ bin/xbps-install/transaction.c | ||||
| @@ -125,6 +125,7 @@ show_package_list(struct transaction *trans, xbps_trans_type_t ttype, unsigned i | ||||
|  		xbps_dictionary_get_bool(obj, "download", &dload); | ||||
|  		tt = xbps_transaction_pkg_type(obj); | ||||
|   | ||||
| +		buf = NULL; | ||||
|  		if (tt == XBPS_TRANS_UPDATE) { | ||||
|  			/* get installed pkgver */ | ||||
|  			ipkgd = xbps_pkgdb_get_pkg(trans->xhp, pkgname); | ||||
| --  | ||||
| 2.25.1 | ||||
|  | ||||
| @@ -1,30 +0,0 @@ | ||||
| From aed9402d6282c193ac23252a8686394ac833b713 Mon Sep 17 00:00:00 2001 | ||||
| From: Duncan Overbruck <mail@duncano.de> | ||||
| Date: Wed, 4 Mar 2020 23:39:27 +0100 | ||||
| Subject: [PATCH 1/2] lib/transaction_check_revdeps.c: fix regression in | ||||
|  revdeps check | ||||
|  | ||||
| this is probably the same as reported in #245. | ||||
|  | ||||
| Its again not resetting/initializing a variable in a loop, | ||||
| falling back to the previous set value. | ||||
| --- | ||||
|  lib/transaction_check_revdeps.c | 2 ++ | ||||
|  1 file changed, 2 insertions(+) | ||||
|  | ||||
| diff --git lib/transaction_check_revdeps.c lib/transaction_check_revdeps.c | ||||
| index 211f1df0..7e30e3e8 100644 | ||||
| --- lib/transaction_check_revdeps.c | ||||
| +++ lib/transaction_check_revdeps.c | ||||
| @@ -172,6 +172,8 @@ xbps_transaction_check_revdeps(struct xbps_handle *xhp, xbps_array_t pkgs) | ||||
|  				error = true; | ||||
|  				goto out; | ||||
|  			} | ||||
| + | ||||
| +			ttype = 0; | ||||
|  			if ((revpkgd = xbps_find_pkg_in_array(pkgs, pkgname, 0))) { | ||||
|  				ttype = xbps_transaction_pkg_type(revpkgd); | ||||
|  				if (ttype == XBPS_TRANS_REMOVE) | ||||
| --  | ||||
| 2.25.1 | ||||
|  | ||||
| @@ -1,35 +0,0 @@ | ||||
| From 044f75450bf80a5434097385cec90715c8655c6f Mon Sep 17 00:00:00 2001 | ||||
| From: Duncan Overbruck <mail@duncano.de> | ||||
| Date: Thu, 5 Mar 2020 00:39:21 +0100 | ||||
| Subject: [PATCH 2/2] lib/transaction_check_revdeps.c: fix previous fix | ||||
|  | ||||
| Don't set transaction type from inside the revdep check, | ||||
| if the package is being removed then there is not point | ||||
| in continueing checking if its breaks. | ||||
|  | ||||
| Referencing #245 | ||||
| --- | ||||
|  lib/transaction_check_revdeps.c | 6 ++---- | ||||
|  1 file changed, 2 insertions(+), 4 deletions(-) | ||||
|  | ||||
| diff --git lib/transaction_check_revdeps.c lib/transaction_check_revdeps.c | ||||
| index 7e30e3e8..389daab2 100644 | ||||
| --- lib/transaction_check_revdeps.c | ||||
| +++ lib/transaction_check_revdeps.c | ||||
| @@ -173,11 +173,9 @@ xbps_transaction_check_revdeps(struct xbps_handle *xhp, xbps_array_t pkgs) | ||||
|  				goto out; | ||||
|  			} | ||||
|   | ||||
| -			ttype = 0; | ||||
|  			if ((revpkgd = xbps_find_pkg_in_array(pkgs, pkgname, 0))) { | ||||
| -				ttype = xbps_transaction_pkg_type(revpkgd); | ||||
| -				if (ttype == XBPS_TRANS_REMOVE) | ||||
| -					revpkgd = NULL; | ||||
| +				if (xbps_transaction_pkg_type(revpkgd) == XBPS_TRANS_REMOVE) | ||||
| +					continue; | ||||
|  			} | ||||
|  			if (revpkgd == NULL) | ||||
|  				revpkgd = xbps_pkgdb_get_pkg(xhp, curpkgver); | ||||
| --  | ||||
| 2.25.1 | ||||
|  | ||||
| @@ -1,16 +1,16 @@ | ||||
| # Template file for 'xbps' | ||||
| pkgname=xbps | ||||
| version=0.59 | ||||
| revision=5 | ||||
| version=0.59.1 | ||||
| revision=1 | ||||
| bootstrap=yes | ||||
| build_style=configure | ||||
| short_desc="XBPS package system utilities" | ||||
| maintainer="Juan RP <xtraeme@gmail.com>" | ||||
| license="BSD-2-Clause" | ||||
| license="BSD-2-Clause, BSD-3-Clause, MIT" | ||||
| homepage="https://github.com/void-linux/xbps" | ||||
| changelog="https://github.com/void-linux/xbps/blob/master/NEWS" | ||||
| distfiles="https://github.com/void-linux/xbps/archive/${version}.tar.gz" | ||||
| checksum=4d4a67b40a6cc4994c2131c786fb17407ddc9041f4f5734b8a9c5d743ede46d0 | ||||
| checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a | ||||
|  | ||||
| hostmakedepends="pkgconf" | ||||
| checkdepends="kyua" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Juan RP
					Juan RP