From acbcfd98ecab03fcd82f5546436bee60349f3a6e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 30 Jul 2018 19:26:32 +0200 Subject: [PATCH] xbps: update to 0.53. --- common/shlibs | 3 +-- .../xbps/patches/0001-fix-uunshare-args.patch | 12 ---------- .../patches/0002-fix-message-padding.patch | 22 ------------------- srcpkgs/xbps/template | 13 +++-------- 4 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 srcpkgs/xbps/patches/0001-fix-uunshare-args.patch delete mode 100644 srcpkgs/xbps/patches/0002-fix-message-padding.patch diff --git a/common/shlibs b/common/shlibs index 670759db3e..c72643aad7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1092,8 +1092,7 @@ libORBit-2.so.0 libORBit2-2.14.19_1 libORBit-imodule-2.so.0 libORBit2-2.14.19_1 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1 libminiupnpc.so.17 miniupnpc-2.1_1 -libxbps.so.2 libxbps-0.25_1 -libxbps.so.2 libxbps-git-0.25_1 +libxbps.so.3 libxbps-0.53_1 libatf-c.so.1 atf-libs-0.21_1 libatf-c++.so.2 atf-libs-0.21_1 libvdeplug.so.3 libvde2-2.3.2_1 diff --git a/srcpkgs/xbps/patches/0001-fix-uunshare-args.patch b/srcpkgs/xbps/patches/0001-fix-uunshare-args.patch deleted file mode 100644 index 3b12c1c8cf..0000000000 --- a/srcpkgs/xbps/patches/0001-fix-uunshare-args.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/bin/xbps-uunshare/main.c b/bin/xbps-uunshare/main.c -index e4f7b647..36e8d39e 100644 ---- ./bin/xbps-uunshare/main.c -+++ ./bin/xbps-uunshare/main.c -@@ -157,7 +157,7 @@ main(int argc, char **argv) - if (argc < 2) - usage(argv0); - -- chrootdir = argv[-1]; -+ chrootdir = argv[0]; - cmd = argv[1]; - cmdargs = argv + 1; diff --git a/srcpkgs/xbps/patches/0002-fix-message-padding.patch b/srcpkgs/xbps/patches/0002-fix-message-padding.patch deleted file mode 100644 index 8a678444d1..0000000000 --- a/srcpkgs/xbps/patches/0002-fix-message-padding.patch +++ /dev/null @@ -1,22 +0,0 @@ -From daa1b446821646d8923623f8a0d6e1b65db0929b Mon Sep 17 00:00:00 2001 -From: Duncaen -Date: Wed, 2 May 2018 00:45:24 +0200 -Subject: [PATCH] xbps-install: fix "Space available on disk:" padding - ---- - bin/xbps-install/transaction.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/xbps-install/transaction.c b/bin/xbps-install/transaction.c -index 00850f86..2601b845 100644 ---- ./bin/xbps-install/transaction.c -+++ ./bin/xbps-install/transaction.c -@@ -211,7 +211,7 @@ show_transaction_sizes(struct transaction *trans, int cols) - "%s\n", strerror(errno)); - return -1; - } -- printf("Space available on disk: %6s\n", size); -+ printf("Space available on disk: %6s\n", size); - } - printf("\n"); - diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 2fd4cc660f..ac69bd9ca0 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps -version=0.52 -revision=7 +version=0.53 +revision=1 bootstrap=yes build_style=configure short_desc="The XBPS package system utilities" @@ -9,19 +9,12 @@ maintainer="Juan RP " homepage="https://github.com/void-linux/xbps" license="BSD-2-Clause" distfiles="https://github.com/void-linux/xbps/archive/$version.tar.gz" -checksum=f9a584d286c28eaf5a00f2e0ea9a8124b2200d50ecb62d26adcabe51f328b551 +checksum=360b3149141fec46dd6da9019605bcee48ee4d29bffe5aa47a9fd5fa68ccd5f4 -CFLAGS='-Wno-error' hostmakedepends="pkg-config" makedepends="zlib-devel libressl-devel libarchive-devel" depends="ca-certificates xbps-triggers" -# xbps needs symbols from glibc-2.22 -case "$XBPS_TARGET_MACHINE" in - *-musl) : ;; - *) depends+=" glibc>=2.22" ;; -esac - if [ "$CHROOT_READY" ]; then makedepends+=" atf-devel" xbps-tests_package() {