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

void-linux · Jan 11, 2024 · 8a8c61a · 8a8c61a
2 parents 1d9cc6d + e82437f
commit 8a8c61a
Show file tree

Hide file tree

Showing 45 changed files with 184 additions and 144 deletions.
diff --git a/README.md b/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
 

diff --git a/bin/xbps-checkvers/main.c b/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>
 

diff --git a/bin/xbps-create/main.c b/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"

diff --git a/bin/xbps-fbulk/main.c b/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>

diff --git a/bin/xbps-install/fetch_cb.c b/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 */

diff --git a/bin/xbps-install/util.c b/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"

diff --git a/bin/xbps-query/search.c b/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>

diff --git a/bin/xbps-query/show-info-files.c b/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"

diff --git a/bin/xbps-rindex/index-add.c b/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"

diff --git a/bin/xbps-rindex/index-clean.c b/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;

diff --git a/bin/xbps-rindex/remove-obsoletes.c b/bin/xbps-rindex/remove-obsoletes.c
@@ -24,14 +24,16 @@
  */
 
 #include <sys/stat.h>
-#include <stdio.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.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 <unistd.h>
 
 #include <xbps.h>
 #include "defs.h"

diff --git a/bin/xbps-rindex/repoflush.c b/bin/xbps-rindex/repoflush.c
@@ -24,17 +24,22 @@
  */
 
 #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 <archive.h>
+#include <archive_entry.h>
 
 #include <xbps.h>
+
 #include "defs.h"
 #include "xbps/xbps_dictionary.h"
 

diff --git a/bin/xbps-uchroot/main.c b/bin/xbps-uchroot/main.c
@@ -32,8 +32,6 @@
  * 	- Supports overlayfs on a temporary directory or a tmpfs mount.
  * 	- Supports read-only bind mounts.
  */
-#define _GNU_SOURCE
-#define _XOPEN_SOURCE 700
 #include <sys/types.h>
 #include <sys/prctl.h>
 #include <sys/fsuid.h>

diff --git a/bin/xbps-uunshare/main.c b/bin/xbps-uunshare/main.c
@@ -22,7 +22,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/fsuid.h>

diff --git a/configure b/configure
@@ -195,7 +195,7 @@ echo "CC =	$CC" >>$CONFIG_MK
 echo "CFLAGS =	-O2" >>$CONFIG_MK
 
 echo "LDFLAGS =  	-L\$(TOPDIR)/lib" >>$CONFIG_MK
-echo "CPPFLAGS = 	-I. -I\$(TOPDIR) -I\$(TOPDIR)/include" >>$CONFIG_MK
+echo "CPPFLAGS = 	-D_DEFAULT_SOURCE -D_GNU_SOURCE -I. -I\$(TOPDIR) -I\$(TOPDIR)/include" >>$CONFIG_MK
 echo "CPPFLAGS +=	-DXBPS_SYSCONF_PATH=\\\"${ETCDIR}\\\"" >>$CONFIG_MK
 echo "CPPFLAGS +=	-DXBPS_SYSDEFCONF_PATH=\\\"${SHAREDIR}/xbps.d\\\"" >>$CONFIG_MK
 echo "CPPFLAGS +=	-DXBPS_VERSION=\\\"${VERSION}\\\"" >>$CONFIG_MK

diff --git a/data/repod-main.conf b/data/repod-main.conf
@@ -1 +1 @@
-repository=https://a-hel-fi.m.voidlinux.org/current
+repository=https://repo-default.voidlinux.org/current
diff --git a/data/xbps.conf b/data/xbps.conf
@@ -48,15 +48,7 @@
 
 ## REPOSITORY MIRRORS
 #
-# - https://beta.de.repo.voidlinux.org/current
-# - https://beta.de.repo.voidlinux.org/current/nonfree
-# - https://beta.de.repo.voidlinux.org/current/multilib
-# - https://beta.de.repo.voidlinux.org/current/multilib/nonfree
-#
-# - http://alpha.us.repo.voidlinux.org/current
-# - http://alpha.us.repo.voidlinux.org/current/nonfree
-# - http://alpha.us.repo.voidlinux.org/current/multilib
-# - http://alpha.us.repo.voidlinux.org/current/multilib/nonfree
+# For a complete list, see https://xmirror.voidlinux.org
 
 ## PRESERVING FILES
 #

diff --git a/data/xbps.d.5 b/data/xbps.d.5
@@ -115,8 +115,8 @@ Note that remote repositories must be signed using
 .Xr xbps-rindex 1 ,
 example:
 .Pp
-.Bl -tag -compact -width repository=https://a-hel-fi.m.voidlinux.org/current
-.It Sy repository=https://a-hel-fi.m.voidlinux.org/current
+.Bl -tag -compact -width repository=https://repo-default.voidlinux.org/current
+.It Sy repository=https://repo-default.voidlinux.org/current
 .It Sy repository=/hostdir/binpkgs
 .El
 .It Sy rootdir=path

diff --git a/include/xbps.h.in b/include/xbps.h.in
@@ -40,9 +40,6 @@
 #include <xbps/xbps_number.h>
 #include <xbps/xbps_string.h>
 
-#include <archive.h>
-#include <archive_entry.h>
-
 #define XBPS_MAXPATH	512
 #define XBPS_NAME_SIZE	64
 

diff --git a/include/xbps_api_impl.h b/include/xbps_api_impl.h
@@ -44,13 +44,6 @@
 #include "queue.h"
 #include "compat.h"
 
-#define EXTRACT_FLAGS	ARCHIVE_EXTRACT_SECURE_NODOTDOT | \
-			ARCHIVE_EXTRACT_SECURE_SYMLINKS | \
-			ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS | \
-			ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_PERM | \
-			ARCHIVE_EXTRACT_UNLINK
-#define FEXTRACT_FLAGS	ARCHIVE_EXTRACT_OWNER | EXTRACT_FLAGS
-
 #ifndef __UNCONST
 #define __UNCONST(a)	((void *)(uintptr_t)(const void *)(a))
 #endif
@@ -59,6 +52,8 @@
 #define __arraycount(x) (sizeof(x) / sizeof(*x))
 #endif
 
+struct archive_entry;
+
 /**
  * @private
  */

diff --git a/lib/archive.c b/lib/archive.c
@@ -29,6 +29,9 @@
 #include <string.h>
 #include <errno.h>
 
+#include <archive.h>
+#include <archive_entry.h>
+
 #include "xbps_api_impl.h"
 
 char HIDDEN *

diff --git a/lib/cb_util.c b/lib/cb_util.c
@@ -23,10 +23,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_VASPRINTF
-# define _GNU_SOURCE    /* for vasprintf(3) */
-#endif
-
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		repository=https://a-hel-fi.m.voidlinux.org/current
		repository=https://repo-default.voidlinux.org/current