From fb260837a3a20350305882d27caafe625173ceda Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 14 Jun 2025 12:53:22 -0400 Subject: [PATCH] xbps: update to 0.60. --- .../xbps/patches/fix-transposed-calloc.patch | 13 -- srcpkgs/xbps/patches/glibc-2.38.patch | 203 ------------------ srcpkgs/xbps/patches/xbps-src-comp.patch | 50 ----- srcpkgs/xbps/template | 6 +- 4 files changed, 3 insertions(+), 269 deletions(-) delete mode 100644 srcpkgs/xbps/patches/fix-transposed-calloc.patch delete mode 100644 srcpkgs/xbps/patches/glibc-2.38.patch delete mode 100644 srcpkgs/xbps/patches/xbps-src-comp.patch diff --git a/srcpkgs/xbps/patches/fix-transposed-calloc.patch b/srcpkgs/xbps/patches/fix-transposed-calloc.patch deleted file mode 100644 index 67341372dab..00000000000 --- a/srcpkgs/xbps/patches/fix-transposed-calloc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/xbps-fbulk/main.c b/bin/xbps-fbulk/main.c -index 6591bb61..4408bf20 100644 ---- a/bin/xbps-fbulk/main.c -+++ b/bin/xbps-fbulk/main.c -@@ -397,7 +397,7 @@ runBuilds(const char *bpath) - static void - addDepn(struct item *item, struct item *xitem) - { -- struct depn *depn = calloc(sizeof(*depn), 1); -+ struct depn *depn = calloc(1, sizeof(*depn)); - char *logpath3; - FILE *fp; - diff --git a/srcpkgs/xbps/patches/glibc-2.38.patch b/srcpkgs/xbps/patches/glibc-2.38.patch deleted file mode 100644 index 18d06ed5241..00000000000 --- a/srcpkgs/xbps/patches/glibc-2.38.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 48c9879d33357254f5f405b3d5463708c9d074f9 Mon Sep 17 00:00:00 2001 -From: Duncan Overbruck -Date: Wed, 10 Jan 2024 17:41:38 +0100 -Subject: [PATCH] lib,bin: cleanup _{GNU,BSD,DEFAULT}_SOURCE, this shouldn't be - per file - ---- - bin/xbps-fbulk/main.c | 2 -- - bin/xbps-query/search.c | 4 ---- - bin/xbps-uchroot/main.c | 2 -- - bin/xbps-uunshare/main.c | 1 - - configure | 2 +- - lib/cb_util.c | 4 ---- - lib/external/dewey.c | 2 -- - lib/external/fexec.c | 4 ---- - lib/fetch/ftp.c | 5 ----- - lib/fetch/http.c | 4 ---- - lib/portableproplib/prop_object.c | 4 +--- - lib/util.c | 8 -------- - 12 files changed, 2 insertions(+), 40 deletions(-) - -diff --git a/bin/xbps-fbulk/main.c b/bin/xbps-fbulk/main.c -index ea298e392..93f4987a9 100644 ---- 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 - #include - #include -diff --git a/bin/xbps-query/search.c b/bin/xbps-query/search.c -index 6724e3ef2..7f3dfe0ff 100644 ---- 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 -diff --git a/bin/xbps-uchroot/main.c b/bin/xbps-uchroot/main.c -index 410afe3b7..c4685335e 100644 ---- 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 - #include - #include -diff --git a/bin/xbps-uunshare/main.c b/bin/xbps-uunshare/main.c -index ac257d383..89ee9b4e7 100644 ---- 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 - #include - #include -diff --git a/configure b/configure -index c7d78bf16..2b54b90ef 100755 ---- 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/lib/cb_util.c b/lib/cb_util.c -index 1aa0f073e..35fbaa77e 100644 ---- 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 - #include - #include -diff --git a/lib/external/dewey.c b/lib/external/dewey.c -index 9ee9901b8..fb6f0d1e7 100644 ---- a/lib/external/dewey.c -+++ b/lib/external/dewey.c -@@ -30,9 +30,7 @@ - - #include - #include --#define _BSD_SOURCE - #include --#undef _BSD_SOURCE - #include - #include - -diff --git a/lib/external/fexec.c b/lib/external/fexec.c -index 11c40120a..57e1de745 100644 ---- a/lib/external/fexec.c -+++ b/lib/external/fexec.c -@@ -27,8 +27,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#define _BSD_SOURCE /* for vfork and chroot */ --#define _DEFAULT_SOURCE /* glibc>=2.20 */ - #include - #include - -@@ -38,8 +36,6 @@ - #include - #include - --#undef _DEFAULT_SOURCE --#undef _BSD_SOURCE - #include "xbps_api_impl.h" - - static int -diff --git a/lib/fetch/ftp.c b/lib/fetch/ftp.c -index 28296a009..9986a57e2 100644 ---- a/lib/fetch/ftp.c -+++ b/lib/fetch/ftp.c -@@ -57,11 +57,6 @@ - * - */ - --#ifdef __linux__ --/* Keep this down to Linux, it can create surprises else where. */ --#define _GNU_SOURCE --#endif -- - #include - #include - -diff --git a/lib/fetch/http.c b/lib/fetch/http.c -index 0165de32c..e0832865c 100644 ---- a/lib/fetch/http.c -+++ b/lib/fetch/http.c -@@ -62,10 +62,6 @@ - * SUCH DAMAGE. - */ - --#if defined(__linux__) --#define _GNU_SOURCE --#endif -- - #include - #include - -diff --git a/lib/portableproplib/prop_object.c b/lib/portableproplib/prop_object.c -index 58dc7da3b..6befb25f2 100644 ---- a/lib/portableproplib/prop_object.c -+++ b/lib/portableproplib/prop_object.c -@@ -38,9 +38,7 @@ - static pthread_mutex_t _prop_refcnt_mtx = PTHREAD_MUTEX_INITIALIZER; - #endif /* _PROP_NEED_REFCNT_MTX */ - --#define __USE_MISC /* MAP_ANON on glibc */ --# include --#undef __USE_MISC -+#include - #include - #include - #include -diff --git a/lib/util.c b/lib/util.c -index 794c37485..659a37caf 100644 ---- a/lib/util.c -+++ b/lib/util.c -@@ -23,14 +23,6 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#ifdef HAVE_VASPRINTF --# define _GNU_SOURCE /* for vasprintf(3) */ --#endif -- --#if defined(HAVE_STRLCAT) || defined(HAVE_STRLCPY) --# define _BSD_SOURCE --#endif -- - #include "compat.h" - - #include diff --git a/srcpkgs/xbps/patches/xbps-src-comp.patch b/srcpkgs/xbps/patches/xbps-src-comp.patch deleted file mode 100644 index 5bcb8c2ddc5..00000000000 --- a/srcpkgs/xbps/patches/xbps-src-comp.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/data/_xbps_src -+++ b/data/_xbps_src -@@ -25,25 +25,35 @@ - compadd "$@" -- ${${dirs:t}%-*} - } - - _arguments -s : \ -+ '-1[Fail if dependencies are missing]' \ -+ '-A[Host architecture]:architecture:($archs)' \ - '-a[Cross compile packages]:architecture:($archs)' \ -+ '-b[Build broken, nocross, and excluded packages]' \ -+ '-c[Configuration file]:config: ' \ - '-C[Do not remove build directory/autodeps/destdir]' \ - '-E[Exit immediately when binary package already exists]' \ - '-f[Force building and registering binary packages]' \ - '-G[Enable XBPS_USE_GIT_REVS]' \ -- '-Q[Enable running the check stage]' \ - '-g[Enable building -dbg packages]' \ - '-H[Absolute path to hostdir]:hostdir:_files -/' \ - '-h[Help]' \ - '-I[Ignore required dependencies]' \ -+ '-i[Make internal errors non-fatal]' \ - '-j[Number of parallel build jobs]:number: ' \ -+ '-K[Enable extended checks]' \ - '-L[Disable ASCII colors]' \ - '-m[Absolute path to masterdir]:masterdir:_files -/' \ - '-N[Disable use of remote repositories]' \ -+ '-p[Show additional variables]:variables: ' \ - '-o[Set package build options]:options: ' \ -+ '-Q[Enable running the check stage]' \ - '-q[Suppress output of xbps-src]' \ - '-r[Use alternative local repository]:repo:_files -/' \ -+ '-s[Make some warnings errors]' \ - '-t[Create a temporary masterdir]' \ -+ '-v[Show verbose messages]' \ -+ '-V[Print version]' \ - '1:target:->target' \ - '*::args:->args' && ret=0 - -@@ -64,9 +80,7 @@ - case $words[1] in - build|check|configure|extract|fetch|install|patch|pkg|show|show-avail|show-build-deps|show-hostmakedepends|show-makedepends|show-options|update-check) - _arguments ':package:_xbps_src_all_packages' && ret=0;; -- binary-bootstrap) -- _arguments '::architecture:($archs)' && ret=0;; -- bootstrap|bootstrap-update|chroot|clean-repocache|consistency-check|list|purge-distfiles|remove-autodeps|show-repo-updates|show-sys-updates|update-bulk|update-sys|update-hash-cache) -+ binary-bootstrap|bootstrap|bootstrap-update|chroot|clean-repocache|consistency-check|list|purge-distfiles|remove-autodeps|show-repo-updates|show-sys-updates|update-bulk|update-sys|update-hash-cache) - # no further arguments - ret=0;; - clean) diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index ea0b61a7855..afa576bcb68 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps -version=0.59.2 -revision=4 +version=0.60 +revision=1 bootstrap=yes build_style=configure short_desc="XBPS package system utilities" @@ -10,7 +10,7 @@ license="BSD-2-Clause, BSD-3-Clause, ISC" 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=a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b +checksum=be417bef66820cb269d466e0b0306d3b1f9ce9cab26ab57379cd9d782eab717d hostmakedepends="pkgconf" checkdepends="kyua"