From 1158509bd1b5e39cfb8e96065c8da8a40ff08311 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 3 Dec 2012 17:30:19 +0100 Subject: [PATCH] xbps: add a temp patch to fix incorrect assertion; enough until 0.19 is out. --- .../remove_obsoletes_incorrect_assertion.patch | 17 +++++++++++++++++ srcpkgs/xbps/template | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xbps/patches/remove_obsoletes_incorrect_assertion.patch diff --git a/srcpkgs/xbps/patches/remove_obsoletes_incorrect_assertion.patch b/srcpkgs/xbps/patches/remove_obsoletes_incorrect_assertion.patch new file mode 100644 index 0000000000..7a8f4730c2 --- /dev/null +++ b/srcpkgs/xbps/patches/remove_obsoletes_incorrect_assertion.patch @@ -0,0 +1,17 @@ +Remove incorrect assertion that may be hit in packages that +set conf_files with files not installed. + +Temporary fix until xbps-0.19 is released. + +--- lib/package_remove_obsoletes.c.orig 2012-12-03 17:27:30.354154688 +0100 ++++ lib/package_remove_obsoletes.c 2012-12-03 17:27:49.560683084 +0100 +@@ -67,7 +67,8 @@ again: + found = false; + obj = prop_array_get(array, i); + oldstr = prop_dictionary_get(obj, "file"); +- assert(oldstr); ++ if (oldstr == NULL) ++ continue; + + file = xbps_xasprintf(".%s", + prop_string_cstring_nocopy(oldstr)); diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 38fe252386..6013748b03 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.18.1 -revision=2 +revision=3 build_style=configure configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin --with-tests --with-static"