diff --git a/srcpkgs/xbps/patches/44692f28d8.patch b/srcpkgs/xbps/patches/44692f28d8.patch new file mode 100644 index 00000000000..fdfe56ec7d8 --- /dev/null +++ b/srcpkgs/xbps/patches/44692f28d8.patch @@ -0,0 +1,22 @@ +commit 44692f28d859728fb919a5d736ada82606196f75 +Author: Johannes Brechtmann +Date: Wed Jun 26 22:51:41 2019 +0200 + + bin/xbps-install: update_pkg return EEXIST if package is up to date + + makes 58509996aabea52ffc40e5e01c9eb00730c6cdcc work for + xbps-install -u + +diff --git a/bin/xbps-install/transaction.c b/bin/xbps-install/transaction.c +index cdcc92d7..fc5538bb 100644 +--- bin/xbps-install/transaction.c ++++ bin/xbps-install/transaction.c +@@ -286,7 +286,7 @@ update_pkg(struct xbps_handle *xhp, const char *pkgname) + rv = xbps_transaction_update_pkg(xhp, pkgname); + if (rv == EEXIST) { + printf("Package '%s' is up to date.\n", pkgname); +- return 0; ++ return EEXIST; + } else if (rv == ENOENT) + fprintf(stderr, "Package '%s' not found in " + "repository pool.\n", pkgname); diff --git a/srcpkgs/xbps/patches/bb96486b127.patch b/srcpkgs/xbps/patches/bb96486b127.patch new file mode 100644 index 00000000000..34f1f5610a6 --- /dev/null +++ b/srcpkgs/xbps/patches/bb96486b127.patch @@ -0,0 +1,33 @@ +commit bb96486b127054e7b0e02c467b0f61a20d227161 +Author: Juan RP +Date: Thu Jun 27 08:02:19 2019 +0200 + + xbps-install: make sure to call xbps_end() before exiting. + +diff --git a/bin/xbps-install/main.c b/bin/xbps-install/main.c +index 371f26c8..3622af5a 100644 +--- bin/xbps-install/main.c ++++ bin/xbps-install/main.c +@@ -263,7 +263,7 @@ main(int argc, char **argv) + } + } + if (eexist == argc) +- return 0; ++ goto out; + + rv = exec_transaction(&xh, maxcols, yes, drun); + } else if (!update) { +@@ -280,11 +280,12 @@ main(int argc, char **argv) + } + } + if (eexist == argc) +- return 0; ++ goto out; + + rv = exec_transaction(&xh, maxcols, yes, drun); + } + ++out: + xbps_end(&xh); + exit(rv); + } diff --git a/srcpkgs/xbps/patches/series b/srcpkgs/xbps/patches/series index b5b9e6145b9..88485bb6382 100644 --- a/srcpkgs/xbps/patches/series +++ b/srcpkgs/xbps/patches/series @@ -1,3 +1,5 @@ d72091a20.patch 83aa486f6ba049399.patch 7b728f5ac.patch +44692f28d8.patch +bb96486b127.patch diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 59d9e0fc4cf..0fe61aeca75 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.56 -revision=4 +revision=5 bootstrap=yes build_style=configure short_desc="XBPS package system utilities"