Subject: [alpine-aports] [PATCH 1/2] community/xbps: Simplify configure arguments

From: Steven McDonald <[email-masked]>
Date: Sat, 22 Sep 2018 16:28:36 +0200

bindir defaults to $prefix/bin, so there is no need to specify it.

localstatedir is only used to derive the location of the package
database by appending db/xbps. /var/db/xbps is what Void uses, as
opposed to /var/lib/xbps/db/xbps, which is what results from the
previous configure arguments. Matching Void here means that a
bootstrapped Void chroot on Alpine will have a usable xbps
installation without having to reinitialise its database and
reinstall all packages.
---
 community/xbps/APKBUILD | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/community/xbps/APKBUILD b/community/xbps/APKBUILD
index cd79e38e1a..fadc73db74 100644
--- a/community/xbps/APKBUILD
+++ b/community/xbps/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: André Klitzing <[email-masked]>
 pkgname=xbps
 pkgver=0.52
-pkgrel=1
+pkgrel=2
 pkgdesc="The X Binary Package System"
 arch="all"
 url="https://github.com/voidlinux/xbps"
@@ -24,9 +24,7 @@ build() {
 
 	./configure \
 		--prefix=/usr \
-		--sysconfdir=/etc \
-		--bindir=/usr/bin \
-		--localstatedir=/var/lib/xbps
+		--sysconfdir=/etc
 	make
 }
 
-- 
2.19.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Steven McDonald <[email-masked]>
Date: Sat, 22 Sep 2018 16:28:37 +0200

---
 community/xbps/APKBUILD                       |  12 +-
 ...moving-_unused-macro-to-_unused_attr.patch | 371 +++++++++---------
 2 files changed, 192 insertions(+), 191 deletions(-)

diff --git a/community/xbps/APKBUILD b/community/xbps/APKBUILD
index fadc73db74..a275d99635 100644
--- a/community/xbps/APKBUILD
+++ b/community/xbps/APKBUILD
@@ -1,11 +1,11 @@
 # Contributor: André Klitzing <[email-masked]>
 # Maintainer: André Klitzing <[email-masked]>
 pkgname=xbps
-pkgver=0.52
-pkgrel=2
+pkgver=0.53
+pkgrel=0
 pkgdesc="The X Binary Package System"
 arch="all"
-url="https://github.com/voidlinux/xbps"
+url="https://github.com/void-linux/xbps"
 license="BSD"
 depends="ca-certificates"
 makedepends="zlib-dev libarchive-dev libressl-dev"
@@ -13,7 +13,7 @@ subpackages="$pkgname-dev $pkgname-doc
 	$pkgname-bash-completion:bashcomp:noarch
 	$pkgname-zsh-completion:zshcomp:noarch"
 options="!check"
-source="$pkgname-$pkgver.tar.gz::https://github.com/voidlinux/$pkgname/archive/$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/void-linux/$pkgname/archive/$pkgver.tar.gz
 	moving-_unused-macro-to-_unused_attr.patch
 	disable-Werror.patch
 	"
@@ -60,6 +60,6 @@ _submv() {
 	mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
 }
 
-sha512sums="99a86abac4e8c3a7e4d6bb72c78a1c1b72592022ab0f90f794227d8fa6194a04e0411fcedc4fffb6809dcf146aa6e7f9b12e3a9854e024458f1b9c4573b7379d  xbps-0.52.tar.gz
-71441115a258efff44a0768a7fb731f4f3730c4ff75279650ac93c051d49ae3153d8bdeaa534cb09681d4b2d1dfba5b9a79b0cdd30a254d84558fd8ac40d2414  moving-_unused-macro-to-_unused_attr.patch
+sha512sums="f40a479196e95cd1c01962230cd3e61f424474ceb454c3d7a31d59b636a0f17138023ae2822bb1666765f15618e3fa7e4fa48786c5530eb975f637b6abf6418f  xbps-0.53.tar.gz
+b95458c80f5891f136980c2481eb563f2e0f2a88120a87f953ca39410e47ac35b944fbe372355cd71b33d67ba7e7e4fdb2ee7da9cc6626825f42d3fb775f2c47  moving-_unused-macro-to-_unused_attr.patch
 a761edd8fd358b500337fcef79f6163ef642fc387f97d952fec0838baa786d585f21e34cd066cba1918f474bccd7decbad2587b91f125b75e308b2dfe8f4721a  disable-Werror.patch"
diff --git a/community/xbps/moving-_unused-macro-to-_unused_attr.patch b/community/xbps/moving-_unused-macro-to-_unused_attr.patch
index 0e01025e8a..dcb1bb1263 100644
--- a/community/xbps/moving-_unused-macro-to-_unused_attr.patch
+++ b/community/xbps/moving-_unused-macro-to-_unused_attr.patch
@@ -11,89 +11,20 @@ This cause the build to fail.
 This patch just rename _unused macro to _unused_attr in order to avoid the
 names being clashed.
 
---- a/lib/package_orphans.c
-+++ b/lib/package_orphans.c
-@@ -60,7 +60,7 @@
-  */
- 
- xbps_array_t
--xbps_find_pkg_orphans(struct xbps_handle *xhp, xbps_array_t orphans_user _unused)
-+xbps_find_pkg_orphans(struct xbps_handle *xhp, xbps_array_t orphans_user _unused_attr)
- {
- 	xbps_array_t rdeps, reqby, array = NULL;
- 	xbps_dictionary_t pkgd, deppkgd;
---- a/lib/rpool.c
-+++ b/lib/rpool.c
-@@ -120,7 +120,7 @@
- }
- 
- void
--xbps_rpool_release(struct xbps_handle *xhp _unused)
-+xbps_rpool_release(struct xbps_handle *xhp _unused_attr)
- {
- 	struct xbps_repo *repo;
- 
-@@ -195,7 +195,7 @@
- }
- 
- static int
--find_pkg_revdeps_cb(struct xbps_repo *repo, void *arg, bool *done _unused)
-+find_pkg_revdeps_cb(struct xbps_repo *repo, void *arg, bool *done _unused_attr)
- {
- 	struct rpool_fpkg *rpf = arg;
- 	xbps_array_t revdeps = NULL;
-@@ -216,7 +216,7 @@
- }
- 
- static int
--find_best_pkg_cb(struct xbps_repo *repo, void *arg, bool *done _unused)
-+find_best_pkg_cb(struct xbps_repo *repo, void *arg, bool *done _unused_attr)
- {
- 	struct rpool_fpkg *rpf = arg;
- 	xbps_dictionary_t pkgd;
---- a/lib/plist_fetch.c
-+++ b/lib/plist_fetch.c
-@@ -46,7 +46,7 @@
- };
- 
- static int
--fetch_archive_open(struct archive *a _unused, void *client_data)
-+fetch_archive_open(struct archive *a _unused_attr, void *client_data)
- {
- 	struct fetch_archive *f = client_data;
- 
-@@ -59,7 +59,7 @@
- }
- 
- static ssize_t
--fetch_archive_read(struct archive *a _unused, void *client_data, const void **buf)
-+fetch_archive_read(struct archive *a _unused_attr, void *client_data, const void **buf)
- {
- 	struct fetch_archive *f = client_data;
- 
-@@ -68,7 +68,7 @@
+--- a/bin/xbps-alternatives/main.c
++++ b/bin/xbps-alternatives/main.c
+@@ -55,7 +55,7 @@
  }
  
  static int
--fetch_archive_close(struct archive *a _unused, void *client_data)
-+fetch_archive_close(struct archive *a _unused_attr, void *client_data)
+-state_cb(const struct xbps_state_cb_data *xscd, void *cbd _unused)
++state_cb(const struct xbps_state_cb_data *xscd, void *cbd _unused_attr)
  {
- 	struct fetch_archive *f = client_data;
- 
---- a/lib/transaction_conflicts.c
-+++ b/lib/transaction_conflicts.c
-@@ -148,7 +148,7 @@
+ 	bool slog = false;
  
- static int
- pkgdb_conflicts_cb(struct xbps_handle *xhp, xbps_object_t obj,
--		const char *key _unused, void *arg, bool *done _unused)
-+		const char *key _unused_attr, void *arg, bool *done _unused_attr)
- {
- 	xbps_array_t pkg_cflicts, trans_cflicts, pkgs = arg;
- 	xbps_dictionary_t pkgd;
 --- a/bin/xbps-create/main.c
 +++ b/bin/xbps-create/main.c
-@@ -187,7 +187,7 @@
+@@ -199,7 +199,7 @@

  static void
@@ -102,51 +33,47 @@ names being clashed.
  {
  	char *altgrname, *args, *p, *saveptr;
  
-@@ -290,7 +290,7 @@
+@@ -302,7 +302,7 @@
  }
  
  static int
--ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf _unused)
-+ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf _unused_attr)
+-ftw_cb(const char *fpath, const struct stat *sb, const struct dirent *dir _unused)
++ftw_cb(const char *fpath, const struct stat *sb, const struct dirent *dir _unused_attr)
  {
+ 	struct xentry *xe = NULL;
  	xbps_dictionary_t fileinfo = NULL;
- 	const char *filep = NULL;
---- a/bin/xbps-rindex/index-clean.c
-+++ b/bin/xbps-rindex/index-clean.c
-@@ -43,9 +43,9 @@
- static int
- idx_cleaner_cb(struct xbps_handle *xhp,
- 		xbps_object_t obj,
--		const char *key _unused,
-+		const char *key _unused_attr,
- 		void *arg,
--		bool *done _unused)
-+		bool *done _unused_attr)
+Only in b: bin/xbps-create/main.c~
+--- a/bin/xbps-install/main.c
++++ b/bin/xbps-install/main.c
+@@ -68,7 +68,7 @@
+ }
+ 
+ static void
+-unpack_progress_cb(const struct xbps_unpack_cb_data *xpd, void *cbdata _unused)
++unpack_progress_cb(const struct xbps_unpack_cb_data *xpd, void *cbdata _unused_attr)
  {
- 	const char *repourl = arg;
- 	const char *arch, *pkgver, *sha256;
---- a/bin/xbps-rindex/remove-obsoletes.c
-+++ b/bin/xbps-rindex/remove-obsoletes.c
-@@ -65,7 +65,7 @@
+ 	if (xpd->entry == NULL || xpd->entry_total_count <= 0)
+ 		return;
+@@ -80,7 +80,7 @@
  }
  
  static int
--cleaner_cb(struct xbps_handle *xhp, xbps_object_t obj, const char *key _unused, void *arg, bool *done _unused)
-+cleaner_cb(struct xbps_handle *xhp, xbps_object_t obj, const char *key _unused_attr, void *arg, bool *done _unused_attr)
+-repo_import_key_cb(struct xbps_repo *repo, void *arg _unused, bool *done _unused)
++repo_import_key_cb(struct xbps_repo *repo, void *arg _unused_attr, bool *done _unused_attr)
  {
- 	struct xbps_repo *repo = ((struct xbps_repo **)arg)[0], *stage = ((struct xbps_repo **)arg)[1];
- 	const char *binpkg;
---- a/bin/xbps-pkgdb/check_pkg_unneeded.c
-+++ b/bin/xbps-pkgdb/check_pkg_unneeded.c
-@@ -43,7 +43,7 @@
-  * 	  and remove them if that was true.
-  */
+ 	int rv;
+ 
+--- a/bin/xbps-install/state_cb.c
++++ b/bin/xbps-install/state_cb.c
+@@ -32,7 +32,7 @@
+ #include "defs.h"
+ 
  int
--check_pkg_unneeded(struct xbps_handle *xhp _unused, const char *pkgname, void *arg)
-+check_pkg_unneeded(struct xbps_handle *xhp _unused_attr, const char *pkgname, void *arg)
+-state_cb(const struct xbps_state_cb_data *xscd, void *cbdata _unused)
++state_cb(const struct xbps_state_cb_data *xscd, void *cbdata _unused_attr)
  {
- 	xbps_array_t replaces;
- 	xbps_dictionary_t pkgd = arg;
+ 	xbps_dictionary_t pkgd;
+ 	const char *instver, *newver;
 --- a/bin/xbps-pkgdb/check.c
 +++ b/bin/xbps-pkgdb/check.c
 @@ -36,11 +36,11 @@
@@ -164,6 +91,17 @@ names being clashed.
  {
  	const char *pkgver;
  	char *pkgname;
+--- a/bin/xbps-pkgdb/check_pkg_unneeded.c
++++ b/bin/xbps-pkgdb/check_pkg_unneeded.c
+@@ -43,7 +43,7 @@
+  * 	  and remove them if that was true.
+  */
+ int
+-check_pkg_unneeded(struct xbps_handle *xhp _unused, const char *pkgname, void *arg)
++check_pkg_unneeded(struct xbps_handle *xhp _unused_attr, const char *pkgname, void *arg)
+ {
+ 	xbps_array_t replaces;
+ 	xbps_dictionary_t pkgd = arg;
 --- a/bin/xbps-query/list.c
 +++ b/bin/xbps-query/list.c
 @@ -38,11 +38,11 @@
@@ -253,32 +191,6 @@ names being clashed.
  {
  	struct fflongest *ffl = arg;
  	const char *pkgver;
---- a/bin/xbps-query/search.c
-+++ b/bin/xbps-query/search.c
-@@ -94,11 +94,11 @@
- }
- 
- static int
--search_array_cb(struct xbps_handle *xhp _unused,
-+search_array_cb(struct xbps_handle *xhp _unused_attr,
- 		xbps_object_t obj,
--		const char *key _unused,
-+		const char *key _unused_attr,
- 		void *arg,
--		bool *done _unused)
-+		bool *done _unused_attr)
- {
- 	xbps_object_t obj2;
- 	struct search_data *sd = arg;
-@@ -210,7 +210,7 @@
- }
- 
- static int
--search_repo_cb(struct xbps_repo *repo, void *arg, bool *done _unused)
-+search_repo_cb(struct xbps_repo *repo, void *arg, bool *done _unused_attr)
- {
- 	xbps_array_t allkeys;
- 	struct search_data *sd = arg;
 --- a/bin/xbps-query/ownedby.c
 +++ b/bin/xbps-query/ownedby.c
 @@ -97,9 +97,9 @@
@@ -314,51 +226,35 @@ names being clashed.
  {
  	xbps_array_t allkeys;
  	struct ffdata *ffd = arg;
---- a/bin/xbps-reconfigure/main.c
-+++ b/bin/xbps-reconfigure/main.c
-@@ -52,7 +52,7 @@
+--- a/bin/xbps-query/search.c
++++ b/bin/xbps-query/search.c
+@@ -94,11 +94,11 @@
  }
  
  static int
--state_cb(const struct xbps_state_cb_data *xscd, void *cbd _unused)
-+state_cb(const struct xbps_state_cb_data *xscd, void *cbd _unused_attr)
- {
- 	bool slog = false;
- 
---- a/bin/xbps-install/state_cb.c
-+++ b/bin/xbps-install/state_cb.c
-@@ -32,7 +32,7 @@
- #include "defs.h"
- 
- int
--state_cb(const struct xbps_state_cb_data *xscd, void *cbdata _unused)
-+state_cb(const struct xbps_state_cb_data *xscd, void *cbdata _unused_attr)
- {
- 	xbps_dictionary_t pkgd;
- 	const char *instver, *newver;
---- a/bin/xbps-install/main.c
-+++ b/bin/xbps-install/main.c
-@@ -68,7 +68,7 @@
- }
- 
- static void
--unpack_progress_cb(const struct xbps_unpack_cb_data *xpd, void *cbdata _unused)
-+unpack_progress_cb(const struct xbps_unpack_cb_data *xpd, void *cbdata _unused_attr)
+-search_array_cb(struct xbps_handle *xhp _unused,
++search_array_cb(struct xbps_handle *xhp _unused_attr,
+ 		xbps_object_t obj,
+-		const char *key _unused,
++		const char *key _unused_attr,
+ 		void *arg,
+-		bool *done _unused)
++		bool *done _unused_attr)
  {
- 	if (xpd->entry == NULL || xpd->entry_total_count <= 0)
- 		return;
-@@ -80,7 +80,7 @@
+ 	xbps_object_t obj2;
+ 	struct search_data *sd = arg;
+@@ -210,7 +210,7 @@
  }
  
  static int
--repo_import_key_cb(struct xbps_repo *repo, void *arg _unused, bool *done _unused)
-+repo_import_key_cb(struct xbps_repo *repo, void *arg _unused_attr, bool *done _unused_attr)
+-search_repo_cb(struct xbps_repo *repo, void *arg, bool *done _unused)
++search_repo_cb(struct xbps_repo *repo, void *arg, bool *done _unused_attr)
  {
- 	int rv;
- 
---- a/bin/xbps-alternatives/main.c
-+++ b/bin/xbps-alternatives/main.c
-@@ -55,7 +55,7 @@
+ 	xbps_array_t allkeys;
+ 	struct search_data *sd = arg;
+--- a/bin/xbps-reconfigure/main.c
++++ b/bin/xbps-reconfigure/main.c
+@@ -52,7 +52,7 @@
  }
  
  static int
@@ -367,19 +263,6 @@ names being clashed.
  {
  	bool slog = false;
  
---- a/bin/xbps-uchroot/main.c
-+++ b/bin/xbps-uchroot/main.c
-@@ -109,8 +109,8 @@
- }
- 
- static int
--ftw_cb(const char *fpath, const struct stat *sb _unused, int type,
--		struct FTW *ftwbuf _unused)
-+ftw_cb(const char *fpath, const struct stat *sb _unused_attr, int type,
-+		struct FTW *ftwbuf _unused_attr)
- {
- 	int sverrno = 0;
- 
 --- a/bin/xbps-remove/clean-cache.c
 +++ b/bin/xbps-remove/clean-cache.c
 @@ -38,8 +38,8 @@
@@ -404,6 +287,44 @@ names being clashed.
  {
  	bool slog = false;
  
+--- a/bin/xbps-rindex/index-clean.c
++++ b/bin/xbps-rindex/index-clean.c
+@@ -47,9 +47,9 @@
+ static int
+ idx_cleaner_cb(struct xbps_handle *xhp,
+ 		xbps_object_t obj,
+-		const char *key _unused,
++		const char *key _unused_attr,
+ 		void *arg,
+-		bool *done _unused)
++		bool *done _unused_attr)
+ {
+ 	struct CleanerCbInfo *info = arg;
+ 	const char *arch, *pkgver, *sha256;
+--- a/bin/xbps-rindex/remove-obsoletes.c
++++ b/bin/xbps-rindex/remove-obsoletes.c
+@@ -65,7 +65,7 @@
+ }
+ 
+ static int
+-cleaner_cb(struct xbps_handle *xhp, xbps_object_t obj, const char *key _unused, void *arg, bool *done _unused)
++cleaner_cb(struct xbps_handle *xhp, xbps_object_t obj, const char *key _unused_attr, void *arg, bool *done _unused_attr)
+ {
+ 	struct xbps_repo *repo = ((struct xbps_repo **)arg)[0], *stage = ((struct xbps_repo **)arg)[1];
+ 	const char *binpkg;
+--- a/bin/xbps-uchroot/main.c
++++ b/bin/xbps-uchroot/main.c
+@@ -109,8 +109,8 @@
+ }
+ 
+ static int
+-ftw_cb(const char *fpath, const struct stat *sb _unused, int type,
+-		struct FTW *ftwbuf _unused)
++ftw_cb(const char *fpath, const struct stat *sb _unused_attr, int type,
++		struct FTW *ftwbuf _unused_attr)
+ {
+ 	int sverrno = 0;
+ 
 --- a/configure
 +++ b/configure
 @@ -192,7 +192,7 @@
@@ -415,3 +336,83 @@ names being clashed.
  
  if [ -d .git ]; then
  	_gitrev=$(git rev-parse --short HEAD)
+--- a/lib/package_orphans.c
++++ b/lib/package_orphans.c
+@@ -60,7 +60,7 @@
+  */
+ 
+ xbps_array_t
+-xbps_find_pkg_orphans(struct xbps_handle *xhp, xbps_array_t orphans_user _unused)
++xbps_find_pkg_orphans(struct xbps_handle *xhp, xbps_array_t orphans_user _unused_attr)
+ {
+ 	xbps_array_t rdeps, reqby, array = NULL;
+ 	xbps_dictionary_t pkgd, deppkgd;
+--- a/lib/plist_fetch.c
++++ b/lib/plist_fetch.c
+@@ -46,7 +46,7 @@
+ };
+ 
+ static int
+-fetch_archive_open(struct archive *a _unused, void *client_data)
++fetch_archive_open(struct archive *a _unused_attr, void *client_data)
+ {
+ 	struct fetch_archive *f = client_data;
+ 
+@@ -59,7 +59,7 @@
+ }
+ 
+ static ssize_t
+-fetch_archive_read(struct archive *a _unused, void *client_data, const void **buf)
++fetch_archive_read(struct archive *a _unused_attr, void *client_data, const void **buf)
+ {
+ 	struct fetch_archive *f = client_data;
+ 
+@@ -68,7 +68,7 @@
+ }
+ 
+ static int
+-fetch_archive_close(struct archive *a _unused, void *client_data)
++fetch_archive_close(struct archive *a _unused_attr, void *client_data)
+ {
+ 	struct fetch_archive *f = client_data;
+ 
+--- a/lib/rpool.c
++++ b/lib/rpool.c
+@@ -120,7 +120,7 @@
+ }
+ 
+ void
+-xbps_rpool_release(struct xbps_handle *xhp _unused)
++xbps_rpool_release(struct xbps_handle *xhp _unused_attr)
+ {
+ 	struct xbps_repo *repo;
+ 
+@@ -195,7 +195,7 @@
+ }
+ 
+ static int
+-find_pkg_revdeps_cb(struct xbps_repo *repo, void *arg, bool *done _unused)
++find_pkg_revdeps_cb(struct xbps_repo *repo, void *arg, bool *done _unused_attr)
+ {
+ 	struct rpool_fpkg *rpf = arg;
+ 	xbps_array_t revdeps = NULL;
+@@ -216,7 +216,7 @@
+ }
+ 
+ static int
+-find_best_pkg_cb(struct xbps_repo *repo, void *arg, bool *done _unused)
++find_best_pkg_cb(struct xbps_repo *repo, void *arg, bool *done _unused_attr)
+ {
+ 	struct rpool_fpkg *rpf = arg;
+ 	xbps_dictionary_t pkgd;
+--- a/lib/transaction_conflicts.c
++++ b/lib/transaction_conflicts.c
+@@ -148,7 +148,7 @@
+ 
+ static int
+ pkgdb_conflicts_cb(struct xbps_handle *xhp, xbps_object_t obj,
+-		const char *key _unused, void *arg, bool *done _unused)
++		const char *key _unused_attr, void *arg, bool *done _unused_attr)
+ {
+ 	xbps_array_t pkg_cflicts, trans_cflicts, pkgs = arg;
+ 	xbps_dictionary_t pkgd;
-- 
2.19.0

---