From 1ed6315bfe4119d9f9945a014f67059fd2352bbf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 21 Jun 2019 09:03:00 +0200
Subject: [PATCH] xbps{,-static}: merge two patches from master.

Fixes build failure on ppc64 (@q66) and a segfault
with xbps-checkvers --format (@duncaen).
---
 srcpkgs/xbps-static/template                  |  2 +-
 ...0a93d13a70c4a9e7af50f5f1d53e48cc52db.patch | 19 ++++++++++++++
 ...bf3c2395edfe0009ba232fee7a1f8e71a91a.patch | 26 +++++++++++++++++++
 srcpkgs/xbps/template                         |  3 ++-
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xbps/patches/9c300a93d13a70c4a9e7af50f5f1d53e48cc52db.patch
 create mode 100644 srcpkgs/xbps/patches/a72cbf3c2395edfe0009ba232fee7a1f8e71a91a.patch

diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index dcb007a57a4..b13fa965526 100644
--- a/srcpkgs/xbps-static/template
+++ b/srcpkgs/xbps-static/template
@@ -2,7 +2,7 @@
 # NOTE: keep this package synchronized with "srcpkgs/xbps".
 pkgname=xbps-static
 version=0.54
-revision=1
+revision=2
 # only musl
 archs="*-musl"
 wrksrc="xbps-${version}"
diff --git a/srcpkgs/xbps/patches/9c300a93d13a70c4a9e7af50f5f1d53e48cc52db.patch b/srcpkgs/xbps/patches/9c300a93d13a70c4a9e7af50f5f1d53e48cc52db.patch
new file mode 100644
index 00000000000..a3a2f381164
--- /dev/null
+++ b/srcpkgs/xbps/patches/9c300a93d13a70c4a9e7af50f5f1d53e48cc52db.patch
@@ -0,0 +1,19 @@
+commit 9c300a93d13a70c4a9e7af50f5f1d53e48cc52db
+Author: Duncaen <mail@duncano.de>
+Date:   Fri Jun 21 00:32:16 2019 +0200
+
+    bin/xbps-checkvers: fix --format long form
+
+diff --git a/bin/xbps-checkvers/main.c b/bin/xbps-checkvers/main.c
+index 43ac0e89..d792e008 100644
+--- bin/xbps-checkvers/main.c
++++ bin/xbps-checkvers/main.c
+@@ -645,7 +645,7 @@ main(int argc, char **argv)
+ 		{ "config", required_argument, NULL, 'C' },
+ 		{ "distdir", required_argument, NULL, 'D' },
+ 		{ "debug", no_argument, NULL, 'd' },
+-		{ "format", no_argument, NULL, 'f' },
++		{ "format", required_argument, NULL, 'f' },
+ 		{ "installed", no_argument, NULL, 'I' },
+ 		{ "ignore-conf-repos", no_argument, NULL, 'i' },
+ 		{ "manual", no_argument, NULL, 'm' },
diff --git a/srcpkgs/xbps/patches/a72cbf3c2395edfe0009ba232fee7a1f8e71a91a.patch b/srcpkgs/xbps/patches/a72cbf3c2395edfe0009ba232fee7a1f8e71a91a.patch
new file mode 100644
index 00000000000..85c128f1bde
--- /dev/null
+++ b/srcpkgs/xbps/patches/a72cbf3c2395edfe0009ba232fee7a1f8e71a91a.patch
@@ -0,0 +1,26 @@
+commit a72cbf3c2395edfe0009ba232fee7a1f8e71a91a
+Author: q66 <daniel@octaforge.org>
+Date:   Fri Jun 21 03:34:27 2019 +0200
+
+    lib/package_unpack.c: silence gcc false positive
+    
+    On some systems, something like this happens:
+    
+    package_unpack.c:375:11: error: 'buf' may be used uninitialized in this function
+    
+    This is not actually a bug as logically `buf` is always initialized
+    in that place, but gcc doesn't like it anyway.
+
+diff --git a/lib/package_unpack.c b/lib/package_unpack.c
+index ecebc694..e995d40c 100644
+--- lib/package_unpack.c
++++ lib/package_unpack.c
+@@ -84,7 +84,7 @@ unpack_archive(struct xbps_handle *xhp,
+ 	size_t  instbufsiz = 0, rembufsiz = 0;
+ 	ssize_t entry_size;
+ 	const char *entry_pname, *transact, *binpkg_pkgver;
+-	char *pkgname, *buf;
++	char *pkgname, *buf = NULL;
+ 	int ar_rv, rv, error, entry_type, flags;
+ 	bool preserve, update, file_exists, keep_conf_file;
+ 	bool skip_extract, force, xucd_stats;
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 1aaee54df0f..f11c0d3ef73 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,13 +1,14 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.54
-revision=1
+revision=2
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="BSD-2-Clause"
 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=f7e97a342d9eb3f38274bef3136f91398692f50d84fd23bc7990da2000936a98