From c2d701bdfbacecd89c5a2ea375677559be90e36d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 26 Nov 2012 23:43:35 +0100 Subject: [PATCH] xbps: update to 0.18.1. --- ...2870f0ed00755afbb16d251aca0de5fb378e.patch | 44 ------------------- ...abb88ee734d094174c509b4fd82ff9ed00b9.patch | 42 ------------------ ...f7f1b4bc4f30d6641504e81bb038a0b14a86.patch | 25 ----------- srcpkgs/xbps/template | 6 +-- 4 files changed, 3 insertions(+), 114 deletions(-) delete mode 100644 srcpkgs/xbps/patches/25612870f0ed00755afbb16d251aca0de5fb378e.patch delete mode 100644 srcpkgs/xbps/patches/743eabb88ee734d094174c509b4fd82ff9ed00b9.patch delete mode 100644 srcpkgs/xbps/patches/b7b6f7f1b4bc4f30d6641504e81bb038a0b14a86.patch diff --git a/srcpkgs/xbps/patches/25612870f0ed00755afbb16d251aca0de5fb378e.patch b/srcpkgs/xbps/patches/25612870f0ed00755afbb16d251aca0de5fb378e.patch deleted file mode 100644 index acbfd3da34f..00000000000 --- a/srcpkgs/xbps/patches/25612870f0ed00755afbb16d251aca0de5fb378e.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 25612870f0ed00755afbb16d251aca0de5fb378e Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Mon, 26 Nov 2012 10:22:09 +0100 -Subject: [PATCH] xbps-query: when checking revdeps from repos use the same - pkgver from repo pkg. - -This fixes showing revdeps for any pkg that uses dependencies like: - - foo>2.0<3.0 - blah<15 ---- - bin/xbps-query/show-deps.c | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/bin/xbps-query/show-deps.c b/bin/xbps-query/show-deps.c -index f6f755f..2f39eae 100644 ---- bin/xbps-query/show-deps.c -+++ bin/xbps-query/show-deps.c -@@ -127,12 +127,17 @@ repo_revdeps_cb(struct xbps_handle *xhp, - int - repo_show_pkg_revdeps(struct xbps_handle *xhp, const char *pkg) - { -- char *pattern; -+ prop_dictionary_t pkgd; -+ const char *pkgver; - - if (xbps_pkg_version(pkg)) -- pattern = strdup(pkg); -- else -- pattern = xbps_xasprintf("%s-9999999", pkg); -+ pkgver = pkg; -+ else { -+ pkgd = xbps_rpool_find_pkg(xhp, pkg, false, false); -+ if (pkgd == NULL) -+ return ENOENT; -+ prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver); -+ } - -- return xbps_rpool_foreach(xhp, repo_revdeps_cb, pattern); -+ return xbps_rpool_foreach(xhp, repo_revdeps_cb, __UNCONST(pkgver)); - } --- -1.8.0 - diff --git a/srcpkgs/xbps/patches/743eabb88ee734d094174c509b4fd82ff9ed00b9.patch b/srcpkgs/xbps/patches/743eabb88ee734d094174c509b4fd82ff9ed00b9.patch deleted file mode 100644 index f33e2306bf4..00000000000 --- a/srcpkgs/xbps/patches/743eabb88ee734d094174c509b4fd82ff9ed00b9.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 743eabb88ee734d094174c509b4fd82ff9ed00b9 Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Sat, 24 Nov 2012 08:50:52 +0100 -Subject: [PATCH] xbps-rindex: dont panic if old binpkg doesn't exist. - ---- - bin/xbps-rindex/common.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/bin/xbps-rindex/common.c b/bin/xbps-rindex/common.c -index cca7871..43e55fe 100644 ---- bin/xbps-rindex/common.c -+++ bin/xbps-rindex/common.c -@@ -42,18 +42,18 @@ remove_pkg(const char *repodir, const char *arch, const char *file) - char *filepath; - int rv; - -- /* Remove real binpkg */ - filepath = xbps_xasprintf("%s/%s/%s", repodir, arch, file); - if (remove(filepath) == -1) { -- rv = errno; -- xbps_error_printf("failed to remove old binpkg `%s': %s\n", -- file, strerror(rv)); -- free(filepath); -- return rv; -+ if (errno != ENOENT) { -+ rv = errno; -+ xbps_error_printf("failed to remove old binpkg " -+ "`%s': %s\n", file, strerror(rv)); -+ free(filepath); -+ return rv; -+ } - } - free(filepath); - -- /* Remove symlink to binpkg */ - filepath = xbps_xasprintf("%s/%s", repodir, file); - if (remove(filepath) == -1) { - rv = errno; --- -1.8.0 - diff --git a/srcpkgs/xbps/patches/b7b6f7f1b4bc4f30d6641504e81bb038a0b14a86.patch b/srcpkgs/xbps/patches/b7b6f7f1b4bc4f30d6641504e81bb038a0b14a86.patch deleted file mode 100644 index c132210b5a8..00000000000 --- a/srcpkgs/xbps/patches/b7b6f7f1b4bc4f30d6641504e81bb038a0b14a86.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b7b6f7f1b4bc4f30d6641504e81bb038a0b14a86 Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Sun, 25 Nov 2012 11:03:03 +0100 -Subject: [PATCH] xbps-create: use the right var in chdir(2) doh. - ---- - bin/xbps-create/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/xbps-create/main.c b/bin/xbps-create/main.c -index df302eb..53b9ad5 100644 ---- bin/xbps-create/main.c -+++ bin/xbps-create/main.c -@@ -710,7 +710,7 @@ main(int argc, char **argv) - process_destdir(mutable_files); - - /* Back to original cwd after file tree walk processing */ -- if (chdir(cwd) == -1) -+ if (chdir(p) == -1) - die("cannot chdir() to cwd %s:", cwd); - - /* --- -1.8.0 - diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 0700d6f81c0..4718eb53bd4 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps -version=0.18 -revision=3 +version=0.18.1 +revision=1 build_style=configure configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin --with-tests --with-static" @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="http://code.google.com/p/xbps" license="Simplified BSD" distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz" -checksum=f4cfc73ef1aeab88f812a3b50652142d66c8e03189adecb9262d8c989d25964c +checksum=7467ad3a10e3c851e3cc69abb1ce5364a65ddda9a57171bd8e127da5bfc833fa long_desc=" The XBPS package system. A new, fast, from scratch and simple binary package manager. This package includes the binary utilities