xbps: update to 0.26.

This commit is contained in:
Juan RP 2013-09-25 11:30:51 +02:00
parent 0ae50382e6
commit 2f24a2019b
3 changed files with 7 additions and 95 deletions

View file

@ -1,64 +0,0 @@
From ecd15b7d57e1d271aa95581e97f1a6b11cd57235 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 5 Jul 2013 10:09:32 +0200
Subject: [PATCH] Check if an update for conflicting pkg is in the transaction
for revdeps in vpkgs.
---
NEWS | 3 +++
lib/transaction_revdeps.c | 21 +++++++++++++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/lib/transaction_revdeps.c b/lib/transaction_revdeps.c
index 316d937..b21c5b5 100644
--- lib/transaction_revdeps.c
+++ lib/transaction_revdeps.c
@@ -45,12 +45,13 @@ check_virtual_pkgs(struct xbps_handle *xhp,
xbps_dictionary_t trans_pkgd,
xbps_dictionary_t rev_pkgd)
{
- xbps_array_t provides, rundeps, mdeps;
+ xbps_array_t unsorted, provides, rundeps, mdeps;
const char *pkgver, *revpkgver, *pkgpattern;
- char *pkgname, *vpkgname, *vpkgver, *str;
+ char *pkgname, *pkgdepname, *vpkgname, *vpkgver, *str;
unsigned int i, x;
bool matched = false;
+ unsorted = xbps_dictionary_get(xhp->transd, "unsorted_deps");
provides = xbps_dictionary_get(trans_pkgd, "provides");
for (i = 0; i < xbps_array_count(provides); i++) {
char *tmp = NULL;
@@ -77,6 +78,21 @@ check_virtual_pkgs(struct xbps_handle *xhp,
if (xbps_pkgpattern_match(vpkgver, pkgpattern))
continue;
+ /*
+ * Installed package conflicts with package
+ * in transaction being updated, check
+ * if a new version of this conflicting package
+ * is in the transaction.
+ */
+ xbps_dictionary_get_cstring_nocopy(trans_pkgd, "pkgver", &pkgver);
+ pkgdepname = xbps_pkg_name(pkgver);
+ assert(pkgdepname);
+ if (xbps_find_pkg_in_array(unsorted, pkgdepname)) {
+ free(pkgdepname);
+ continue;
+ }
+ free(pkgdepname);
+
mdeps = xbps_dictionary_get(xhp->transd, "missing_deps");
xbps_dictionary_get_cstring_nocopy(trans_pkgd, "pkgver", &pkgver);
xbps_dictionary_get_cstring_nocopy(rev_pkgd, "pkgver", &revpkgver);
@@ -87,6 +103,7 @@ check_virtual_pkgs(struct xbps_handle *xhp,
free(str);
matched = true;
}
+ free(vpkgname);
free(vpkgver);
}
return matched;
--
1.8.3

View file

@ -1,26 +0,0 @@
From 6358cf43fc3d9ba8d9f9ac98078dd7b8f70fe31c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 7 Jul 2013 09:59:25 +0200
Subject: [PATCH 1/2] xbps-query: fix regression in -R, also print repository
string object.
---
bin/xbps-query/show-info-files.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bin/xbps-query/show-info-files.c b/bin/xbps-query/show-info-files.c
index 244db86..4c09fbf 100644
--- bin/xbps-query/show-info-files.c
+++ bin/xbps-query/show-info-files.c
@@ -302,6 +302,8 @@ repo_show_pkg_info(struct xbps_handle *xhp,
if ((bpkgd = xbps_repo_get_pkg_plist(xhp, ipkgd, "./props.plist")) == NULL)
return errno;
+ xbps_dictionary_set(bpkgd, "repository",
+ xbps_dictionary_get(ipkgd, "repository"));
xbps_dictionary_set(bpkgd, "filename-sha256",
xbps_dictionary_get(ipkgd, "filename-sha256"));
xbps_dictionary_set(bpkgd, "filename-size",
--
1.8.3.2

View file

@ -1,17 +1,19 @@
# Template file for 'xbps'
pkgname=xbps
version=0.25
revision=3
version=0.26
revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug --enable-tests"
hostmakedepends="which pkg-config"
makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel atf-devel"
short_desc="The XBPS package system utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://code.google.com/p/xbps"
homepage="http://xtraeme.github.io/xbps"
license="Simplified BSD"
distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz"
checksum=020c340cbbd5dd1913203671fb8a5c4565fb928ad9d8eb4f43674a6c2f513606
do_fetch() {
git clone -b${version} git://github.com/xtraeme/xbps.git xbps-${version}
}
libxbps_package() {
short_desc+=" - runtime library"