xbps: update to 0.46.

This commit is contained in:
Juan RP 2015-06-24 10:18:02 +02:00
parent d75a00cf25
commit 43d8c9e52a
3 changed files with 2 additions and 71 deletions

View file

@ -1,41 +0,0 @@
From 1774d17e404b43a48de341aad7afb569937b9e86 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Fri, 5 Jun 2015 08:29:05 +0200
Subject: [PATCH] Keep /usr/sbin if found as obsolete, it's a symlink in void.
---
NEWS | 3 +++
lib/package_find_obsoletes.c | 1 +
lib/package_remove.c | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
--- lib/package_find_obsoletes.c
+++ lib/package_find_obsoletes.c
@@ -80,6 +80,7 @@ xbps_find_pkg_obsoletes(struct xbps_handle *xhp,
const char *basesymlinks[] = {
"./bin",
"./sbin",
+ "./usr/sbin",
"./lib",
"./lib32",
"./lib64",
--- lib/package_remove.c
+++ lib/package_remove.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
@@ -106,6 +106,7 @@ remove_pkg_files(struct xbps_handle *xhp,
const char *basesymlinks[] = {
"/bin",
"/sbin",
+ "/usr/sbin",
"/lib",
"/lib32",
"/lib64",
--
2.4.2

View file

@ -1,28 +0,0 @@
From 00149d0f3775c81c541f48f83860a45998e34c66 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 20 Jun 2015 09:48:21 +0200
Subject: [PATCH] xbps_transaction_prepare: if ENOSPC, keep the transaction
dictionary.
... we need this in xbps-install to print required/free space on rootfs.
Close #101
---
NEWS | 4 ++++
lib/transaction_dictionary.c | 2 --
2 files changed, 4 insertions(+), 2 deletions(-)
--- lib/transaction_dictionary.c
+++ lib/transaction_dictionary.c
@@ -344,8 +344,6 @@ xbps_transaction_prepare(struct xbps_handle *xhp)
* and removed to the transaction dictionary.
*/
if ((rv = compute_transaction_stats(xhp)) != 0) {
- xbps_object_release(xhp->transd);
- xhp->transd = NULL;
return rv;
}
/*
--
2.4.4

View file

@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.45
revision=4
version=0.46
revision=1
bootstrap=yes
build_style=configure
short_desc="The XBPS package system utilities"