From e54b59af03c6f73d8f549598574b6dea39f8d3c2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 10 Nov 2015 15:46:58 +0100 Subject: [PATCH] xbps: update to 0.50. --- ...lly-make-relative-symlinks-this-time.patch | 136 ------------------ .../0002-alternatives-fix-a-warning.patch | 25 ---- .../0003-alternatives-fix-an-assertion.patch | 25 ---- ...ackages-ignore-internal-xbps-objects.patch | 35 ----- srcpkgs/xbps/template | 6 +- 5 files changed, 3 insertions(+), 224 deletions(-) delete mode 100644 srcpkgs/xbps/patches/0001-alternatives-really-make-relative-symlinks-this-time.patch delete mode 100644 srcpkgs/xbps/patches/0002-alternatives-fix-a-warning.patch delete mode 100644 srcpkgs/xbps/patches/0003-alternatives-fix-an-assertion.patch delete mode 100644 srcpkgs/xbps/patches/0004-xbps_configure_packages-ignore-internal-xbps-objects.patch diff --git a/srcpkgs/xbps/patches/0001-alternatives-really-make-relative-symlinks-this-time.patch b/srcpkgs/xbps/patches/0001-alternatives-really-make-relative-symlinks-this-time.patch deleted file mode 100644 index ec863278eca..00000000000 --- a/srcpkgs/xbps/patches/0001-alternatives-really-make-relative-symlinks-this-time.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 512122da4cb3c9fd6c5cea26cd7290b0d7f1e620 Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Sat, 31 Oct 2015 14:01:20 +0100 -Subject: [PATCH] alternatives: really make relative symlinks this time. - ---- - NEWS | 2 ++ - lib/package_alternatives.c | 15 +++++++++++---- - tests/xbps/xbps-alternatives/main.sh | 25 ++++++++----------------- - 3 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/lib/package_alternatives.c b/lib/package_alternatives.c -index 958c9f1..b71081e 100644 ---- lib/package_alternatives.c -+++ lib/package_alternatives.c -@@ -102,23 +102,28 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname) - cnt = xbps_array_count(a); - for (i = 0; i < cnt; i++) { - xbps_string_t str; -- char *l, *lnk; -- const char *tgt; -+ char *l, *lnk, *tgt; -+ const char *tgt0; - int rv; - - str = xbps_array_get(a, i); - l = left(xbps_string_cstring_nocopy(str)); - assert(l); -- tgt = right(xbps_string_cstring_nocopy(str)); -+ tgt0 = right(xbps_string_cstring_nocopy(str)); - assert(tgt); - if (l[0] != '/') { - char *tgt_dup, *tgt_dir; -- tgt_dup = strdup(tgt); -+ tgt_dup = strdup(tgt0); - assert(tgt_dup); - tgt_dir = dirname(tgt_dup); - lnk = xbps_xasprintf("%s%s/%s", xhp->rootdir, tgt_dir, l); - free(tgt_dup); -+ tgt_dup = strdup(tgt0); -+ assert(tgt_dup); -+ tgt = strdup(basename(tgt_dup)); -+ free(tgt_dup); - } else { -+ tgt = strdup(tgt0); - lnk = xbps_xasprintf("%s%s", xhp->rootdir, l); - } - xbps_set_cb_state(xhp, XBPS_STATE_ALTGROUP_LINK_ADDED, 0, NULL, -@@ -128,10 +133,12 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname) - xbps_dbg_printf(xhp, "failed to create alt symlink '%s'" - "for group '%s': %s\n", lnk, grname, - strerror(errno)); -+ free(tgt); - free(lnk); - free(l); - return rv; - } -+ free(tgt); - free(lnk); - free(l); - } -diff --git a/tests/xbps/xbps-alternatives/main.sh b/tests/xbps/xbps-alternatives/main.sh -index 8d16314..463272c 100644 ---- tests/xbps/xbps-alternatives/main.sh -+++ tests/xbps/xbps-alternatives/main.sh -@@ -35,9 +35,9 @@ register_one_relative_head() { - } - register_one_relative_body() { - mkdir -p repo pkg_A/usr/bin -- touch pkg_A/usr/bin/fileA pkg_A/usr/bin/fileB -+ touch pkg_A/usr/bin/fileA - cd repo -- xbps-create -A noarch -n A-1.1_1 -s "A pkg" --alternatives "file:../file:/usr/bin/fileA file2:file2:/usr/bin/fileB" ../pkg_A -+ xbps-create -A noarch -n A-1.1_1 -s "A pkg" --alternatives "file:file:/usr/bin/fileA" ../pkg_A - atf_check_equal $? 0 - xbps-rindex -d -a $PWD/*.xbps - atf_check_equal $? 0 -@@ -47,17 +47,8 @@ register_one_relative_body() { - atf_check_equal $? 0 - rv=1 - if [ -e root/usr/bin/fileA ]; then -- lnk=$(readlink root/usr/file) -- if [ "$lnk" = "/usr/bin/fileA" ]; then -- rv=0 -- fi -- echo "A lnk: $lnk" -- fi -- atf_check_equal $rv 0 -- rv=1 -- if [ -e root/usr/bin/fileB ]; then -- lnk=$(readlink root/usr/bin/file2) -- if [ "$lnk" = "/usr/bin/fileB" ]; then -+ lnk=$(readlink root/usr/bin/file) -+ if [ "$lnk" = "fileA" ]; then - rv=0 - fi - echo "A lnk: $lnk" -@@ -150,7 +141,7 @@ unregister_one_body() { - atf_check_equal $? 0 - xbps-remove -r root -yvd A - rv=1 -- if [ ! -L root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then -+ if [ ! -e root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then - rv=0 - fi - atf_check_equal $rv 0 -@@ -175,7 +166,7 @@ unregister_one_relative_body() { - atf_check_equal $? 0 - xbps-remove -r root -yvd A - rv=1 -- if [ ! -L root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then -+ if [ ! -e root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then - rv=0 - fi - atf_check_equal $rv 0 -@@ -211,7 +202,7 @@ unregister_multi_body() { - atf_check_equal $rv 0 - xbps-remove -r root -yvd A - rv=1 -- if [ ! -L root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then -+ if [ ! -e root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then - rv=0 - fi - atf_check_equal $rv 0 -@@ -230,7 +221,7 @@ unregister_multi_body() { - - xbps-remove -r root -yvd B - rv=1 -- if [ ! -L root/usr/bin/file -a ! -e root/usr/bin/fileB ]; then -+ if [ ! -e root/usr/bin/file -a ! -e root/usr/bin/fileB ]; then - rv=0 - fi - atf_check_equal $rv 0 --- -2.6.2 - diff --git a/srcpkgs/xbps/patches/0002-alternatives-fix-a-warning.patch b/srcpkgs/xbps/patches/0002-alternatives-fix-a-warning.patch deleted file mode 100644 index 14e726a83b7..00000000000 --- a/srcpkgs/xbps/patches/0002-alternatives-fix-a-warning.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 33a1bea633048a9d52f1ba52ec19852d321ffb37 Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Sat, 31 Oct 2015 14:07:12 +0100 -Subject: [PATCH 1/2] alternatives: fix a warning. - ---- - lib/package_alternatives.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/package_alternatives.c b/lib/package_alternatives.c -index b71081e..58caa41 100644 ---- lib/package_alternatives.c -+++ lib/package_alternatives.c -@@ -102,7 +102,7 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname) - cnt = xbps_array_count(a); - for (i = 0; i < cnt; i++) { - xbps_string_t str; -- char *l, *lnk, *tgt; -+ char *l, *lnk, *tgt = NULL; - const char *tgt0; - int rv; - --- -2.6.2 - diff --git a/srcpkgs/xbps/patches/0003-alternatives-fix-an-assertion.patch b/srcpkgs/xbps/patches/0003-alternatives-fix-an-assertion.patch deleted file mode 100644 index 4a9666d6464..00000000000 --- a/srcpkgs/xbps/patches/0003-alternatives-fix-an-assertion.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f896b17ba73a51451b221ebfc1bae59022cabcec Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Sat, 31 Oct 2015 14:19:50 +0100 -Subject: [PATCH 2/2] alternatives: fix an assertion! - ---- - lib/package_alternatives.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/package_alternatives.c b/lib/package_alternatives.c -index 58caa41..19c1422 100644 ---- lib/package_alternatives.c -+++ lib/package_alternatives.c -@@ -110,7 +110,7 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname) - l = left(xbps_string_cstring_nocopy(str)); - assert(l); - tgt0 = right(xbps_string_cstring_nocopy(str)); -- assert(tgt); -+ assert(tgt0); - if (l[0] != '/') { - char *tgt_dup, *tgt_dir; - tgt_dup = strdup(tgt0); --- -2.6.2 - diff --git a/srcpkgs/xbps/patches/0004-xbps_configure_packages-ignore-internal-xbps-objects.patch b/srcpkgs/xbps/patches/0004-xbps_configure_packages-ignore-internal-xbps-objects.patch deleted file mode 100644 index a44e040e9cb..00000000000 --- a/srcpkgs/xbps/patches/0004-xbps_configure_packages-ignore-internal-xbps-objects.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1ed8551c08c11bd627d573cde48574200c7e8760 Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Sat, 31 Oct 2015 15:03:26 +0100 -Subject: [PATCH] xbps_configure_packages: ignore internal xbps objects. - -Fixes an assertion triggered by `xbps-reconfigure -a`. ---- - NEWS | 3 +++ - lib/package_configure.c | 5 +++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/lib/package_configure.c b/lib/package_configure.c -index be8aeb5..e279199 100644 ---- lib/package_configure.c -+++ lib/package_configure.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 -@@ -61,7 +61,8 @@ xbps_configure_packages(struct xbps_handle *xhp, xbps_array_t ignpkgs) - assert(iter); - while ((obj = xbps_object_iterator_next(iter))) { - pkgd = xbps_dictionary_get_keysym(xhp->pkgdb, obj); -- xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver); -+ if (!xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver)) -+ continue; - if (xbps_array_count(ignpkgs)) { - if ((xbps_match_string_in_array(ignpkgs, pkgver)) || - (xbps_match_pkgver_in_array(ignpkgs, pkgver))) { --- -2.6.2 - diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 088d23e890f..bfbf9c86064 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps -version=0.49 -revision=4 +version=0.50 +revision=1 bootstrap=yes build_style=configure short_desc="The XBPS package system utilities" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="https://github.com/voidlinux/xbps" license="2-clause-BSD" distfiles="https://github.com/voidlinux/xbps/archive/$version.tar.gz" -checksum=54a5b7bed63f471df2c28749e39b4f630fd78a5a49ac4a60e33edcc0dc95645f +checksum=d8a8b7a62d7b3da16d457dc703f6acfa3ebe97c59b25e39544361330ed82650d hostmakedepends="pkg-config" makedepends="zlib-devel libressl-devel libarchive-devel"