xbps{,-static}: merge patch from master to keep /usr/sbin.

srcpkgs/xbps-static/template

@@ -3,7 +3,7 @@
 # NOTE: keep this package synchronized with "srcpkgs/xbps".
 pkgname=xbps-static
 version=0.45
-revision=2
+revision=3
 build_style=configure
 short_desc="The XBPS package system utilities - static binaries"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"

srcpkgs/xbps/patches/0001-Keep-usr-sbin-if-found-as-obsolete-it-s-a-symlink-in.patch

@@ -0,0 +1,41 @@
+From 1774d17e404b43a48de341aad7afb569937b9e86 Mon Sep 17 00:00:00 2001
+From: Juan RP <xtraeme@voidlinux.eu>
+Date: Fri, 5 Jun 2015 08:29:05 +0200
+Subject: [PATCH] Keep /usr/sbin if found as obsolete, it's a symlink in void.
+
+---
+ NEWS                         | 3 +++
+ lib/package_find_obsoletes.c | 1 +
+ lib/package_remove.c         | 3 ++-
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+--- lib/package_find_obsoletes.c
++++ lib/package_find_obsoletes.c
+@@ -80,6 +80,7 @@ xbps_find_pkg_obsoletes(struct xbps_handle *xhp,
+ 	const char *basesymlinks[] = {
+ 		"./bin",
+ 		"./sbin",
++		"./usr/sbin",
+ 		"./lib",
+ 		"./lib32",
+ 		"./lib64",
+--- lib/package_remove.c
++++ lib/package_remove.c
+@@ -1,5 +1,5 @@
+ /*-
+- * Copyright (c) 2009-2014 Juan Romero Pardines.
++ * Copyright (c) 2009-2015 Juan Romero Pardines.
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -106,6 +106,7 @@ remove_pkg_files(struct xbps_handle *xhp,
+ 	const char *basesymlinks[] = {
+ 		"/bin",
+ 		"/sbin",
++		"/usr/sbin",
+ 		"/lib",
+ 		"/lib32",
+ 		"/lib64",
+-- 
+2.4.2
+

srcpkgs/xbps/template

@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.45
-revision=1
+revision=3
 bootstrap=yes
 build_style=configure
 short_desc="The XBPS package system utilities"