xbps: update to 0.19.1.
This commit is contained in:
Juan RP
parent
cda36ac99e
commit
64143f6adb
|
|
@ -1,10 +1,6 @@
|
|||
# Template file for 'libxbps-devel'.
|
||||
#
|
||||
short_desc="${short_desc} - runtime library (development files)"
|
||||
long_desc="${long_desc}
|
||||
|
||||
This package contains the libxbps develoment files."
|
||||
|
||||
depends="zlib-devel proplib-devel confuse-devel libfetch-devel
|
||||
libarchive-devel libxbps>=$version"
|
||||
replaces="xbps-static<0.16.3_2 libxbps-devel>=0"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
# Template file for 'libxbps'.
|
||||
#
|
||||
short_desc="${short_desc} - runtime library"
|
||||
long_desc="${long_desc}
|
||||
|
||||
This package contains libxbps, the XBPS runtime shared library."
|
||||
|
||||
replaces="xbps<0.16.3_2 libxbps>=0"
|
||||
|
||||
do_install() {
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
From 9489f8a3dc1deff2548032c102e22c7308df74c7 Mon Sep 17 00:00:00 2001
|
||||
From: Juan RP <xtraeme@gmail.com>
|
||||
Date: Thu, 20 Dec 2012 12:08:55 +0100
|
||||
Subject: [PATCH] Do not configure pkg if there's an update in transaction.
|
||||
|
||||
This fixes the following problem:
|
||||
|
||||
- pkg is installed with state "unpacked".
|
||||
- There's an update of pkg in transaction.
|
||||
- xbps tries to configure the pkg because its state is "unpacked",
|
||||
therefore ignoring the update.
|
||||
---
|
||||
NEWS | 5 +++++
|
||||
lib/transaction_ops.c | 2 +-
|
||||
2 files changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/transaction_ops.c b/lib/transaction_ops.c
|
||||
index e25f1c4..89233f0 100644
|
||||
--- lib/transaction_ops.c
|
||||
+++ lib/transaction_ops.c
|
||||
@@ -145,7 +145,7 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, int action)
|
||||
if ((rv = xbps_set_pkg_state_dictionary(pkg_repod, state)) != 0)
|
||||
return rv;
|
||||
|
||||
- if (state == XBPS_PKG_STATE_UNPACKED)
|
||||
+ if ((action == TRANS_INSTALL) && (state == XBPS_PKG_STATE_UNPACKED))
|
||||
reason = "configure";
|
||||
else if (state == XBPS_PKG_STATE_NOT_INSTALLED)
|
||||
reason = "install";
|
||||
--
|
||||
1.8.0.2
|
||||
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
From 6a60bceb54b4a1cd01ecb5f7cd3da35677544dc7 Mon Sep 17 00:00:00 2001
|
||||
From: Juan RP <xtraeme@gmail.com>
|
||||
Date: Mon, 17 Dec 2012 11:27:10 +0100
|
||||
Subject: [PATCH] xbps_configure_pkg: set pkg state in our pkg dictionary from
|
||||
pkgdb.
|
||||
|
||||
Replacing a dictionary while the iterator is held invalidates this iterator, thus
|
||||
breaking the loop.
|
||||
|
||||
Thanks to pancake for finding this issue.
|
||||
---
|
||||
lib/package_configure.c | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/package_configure.c b/lib/package_configure.c
|
||||
index eba9efa..08683e9 100644
|
||||
--- lib/package_configure.c
|
||||
+++ lib/package_configure.c
|
||||
@@ -62,8 +62,11 @@ xbps_configure_packages(struct xbps_handle *xhp, bool flush)
|
||||
while ((obj = prop_object_iterator_next(iter))) {
|
||||
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
|
||||
rv = xbps_configure_pkg(xhp, pkgname, true, false, false);
|
||||
- if (rv != 0)
|
||||
+ if (rv != 0) {
|
||||
+ xbps_dbg_printf(xhp, "%s: failed to configure %s: %s\n",
|
||||
+ __func__, pkgname, strerror(rv));
|
||||
break;
|
||||
+ }
|
||||
}
|
||||
prop_object_iterator_release(iter);
|
||||
|
||||
@@ -133,8 +136,7 @@ xbps_configure_pkg(struct xbps_handle *xhp,
|
||||
return rv;
|
||||
}
|
||||
|
||||
- rv = xbps_set_pkg_state_installed(xhp, pkgname, version,
|
||||
- XBPS_PKG_STATE_INSTALLED);
|
||||
+ rv = xbps_set_pkg_state_dictionary(pkgd, XBPS_PKG_STATE_INSTALLED);
|
||||
if (rv != 0) {
|
||||
xbps_set_cb_state(xhp, XBPS_STATE_CONFIGURE_FAIL, rv,
|
||||
pkgname, version,
|
||||
--
|
||||
1.8.0.2
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'xbps'
|
||||
pkgname=xbps
|
||||
version=0.19
|
||||
revision=3
|
||||
version=0.19.1
|
||||
revision=1
|
||||
build_style=configure
|
||||
configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
|
||||
--with-tests --with-static"
|
||||
|
|
@ -16,8 +16,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://code.google.com/p/xbps"
|
||||
license="Simplified BSD"
|
||||
distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz"
|
||||
checksum=15355389722c1cecd2a54d568afc61e11fa73bc85f8ff6b5c5dd8900deb9a226
|
||||
long_desc="
|
||||
The XBPS package system. A new, fast, from scratch and simple
|
||||
binary package manager. This package includes the binary utilities
|
||||
to be able to handle XBPS binary packages."
|
||||
checksum=e52a1645d42fe14aec829df9ba1a3c572659056ed5fd8581aeb5ef95687896a6
|
||||
|
|
|
|||
|
|
@ -2,11 +2,6 @@
|
|||
#
|
||||
depends="xbps-triggers"
|
||||
short_desc="${short_desc} - static binaries"
|
||||
long_desc="${long_desc}
|
||||
|
||||
This package contains the static binaries, that can be
|
||||
used on any GNU/Linux distribution matching the architecture."
|
||||
|
||||
replaces="xbps-static>=0"
|
||||
|
||||
do_install() {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
# Template file for 'xbps-tests'.
|
||||
#
|
||||
short_desc="${short_desc} - Kyua testsuite"
|
||||
long_desc="${long_desc}
|
||||
|
||||
This package contains the Kyua testsuite."
|
||||
|
||||
replaces="xbps<0.16.3_2 xbps-tests>=0"
|
||||
|
||||
do_install() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue