Merge branch 'master' of https://github.com/void-linux/xbps

Author: friedelschoen

README.md

@@ -128,14 +128,14 @@ Good luck!
 
 Binaries for Linux compiled statically with the musl C library are available:
 
-* [aarch64](https://a-hel-fi.m.voidlinux.org/static/xbps-static-latest.aarch64-musl.tar.xz)
-* [armv6hf](https://a-hel-fi.m.voidlinux.org/static/xbps-static-latest.armv6l-musl.tar.xz)
-* [i686](https://a-hel-fi.m.voidlinux.org/static/xbps-static-latest.i686-musl.tar.xz)
-* [x86\_64](https://a-hel-fi.m.voidlinux.org/static/xbps-static-latest.x86_64-musl.tar.xz)
-* [mips32](https://a-hel-fi.m.voidlinux.org/static/xbps-static-latest.mips-musl.tar.xz)
+* [aarch64](https://repo-default.voidlinux.org/static/xbps-static-latest.aarch64-musl.tar.xz)
+* [armv6l](https://repo-default.voidlinux.org/static/xbps-static-latest.armv6l-musl.tar.xz)
+* [armv7l](https://repo-default.voidlinux.org/static/xbps-static-latest.armv7l-musl.tar.xz)
+* [i686](https://repo-default.voidlinux.org/static/xbps-static-latest.i686-musl.tar.xz)
+* [x86\_64](https://repo-default.voidlinux.org/static/xbps-static-latest.x86_64-musl.tar.xz)
 
 These builds are available on all official void mirrors, along with their
-*sha256* [checksums](https://a-hel-fi.m.voidlinux.org/static/sha256sums.txt).
+*sha256* [checksums](https://repo-default.voidlinux.org/static/sha256sums.txt).
 
 ### Usage instructions
 

bin/xbps-checkvers/main.c

@@ -26,18 +26,20 @@
  *
  */
 
+#include <sys/stat.h>
+
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
 #include <getopt.h>
+#include <limits.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <limits.h>
-#include <sys/stat.h>
-#include <assert.h>
+#include <unistd.h>
 
 #include <xbps.h>
 

bin/xbps-create/main.c

@@ -22,25 +22,30 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <sys/types.h>
+
+#include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <sys/mman.h>
-#include <stdio.h>
+#include <sys/types.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <ftw.h>
+#include <getopt.h>
+#include <libgen.h>
+#include <locale.h>
+#include <stdarg.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <assert.h>
 #include <unistd.h>
-#include <getopt.h>
-#include <ftw.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <locale.h>
-#include <dirent.h>
+
+#include <archive.h>
+#include <archive_entry.h>
 
 #include <xbps.h>
 #include "queue.h"

bin/xbps-fbulk/main.c

@@ -47,8 +47,6 @@
  * Only one attempt is made to build any given package, no matter how many
  * other packages depend on it.
  */
-#define _DEFAULT_SOURCE
-#define _BSD_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

bin/xbps-install/fetch_cb.c

@@ -31,16 +31,20 @@
  */
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <sys/types.h>
+
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <fcntl.h>
+#include <time.h>
+#include <unistd.h>
 
 #include <xbps.h>
+
 #include "defs.h"
 
 static int v_tty; /* stderr is a tty */

bin/xbps-install/util.c

@@ -23,15 +23,17 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
+#include <sys/ioctl.h>
+
+#include <assert.h>
 #include <errno.h>
 #include <fnmatch.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <sys/ioctl.h>
-#include <assert.h>
+#include <unistd.h>
 
 #include <xbps.h>
 #include "defs.h"

bin/xbps-query/search.c

@@ -23,10 +23,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_STRCASESTR
-# define _GNU_SOURCE    /* for strcasestr(3) */
-#endif
-
 #include "compat.h"
 
 #include <stdio.h>

bin/xbps-query/show-info-files.c

@@ -23,15 +23,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <assert.h>
+#include <errno.h>
+#include <fnmatch.h>
+#include <libgen.h>
+#include <limits.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <libgen.h>
-#include <fnmatch.h>
-#include <assert.h>
+#include <unistd.h>
 
 #include <xbps.h>
 #include "defs.h"

bin/xbps-rindex/index-add.c

@@ -24,15 +24,17 @@
  */
 
 #include <sys/stat.h>
-#include <stdio.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <libgen.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <dirent.h>
-#include <libgen.h>
-#include <assert.h>
-#include <fcntl.h>
+#include <unistd.h>
 
 #include <xbps.h>
 #include "defs.h"

bin/xbps-rindex/index-clean.c

@@ -24,18 +24,21 @@
  */
 
 #include <sys/stat.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+
+#include <assert.h>
 #include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <libgen.h>
-#include <assert.h>
 #include <pthread.h>
-#include <fcntl.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <xbps.h>
+
 #include "defs.h"
 
 static xbps_dictionary_t dest;