From 8a19228235de3c947f744f528a3798d19423968a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 19 Apr 2013 10:39:31 +0200 Subject: [PATCH] xbps: update to 0.23. --- ...e-the-version-target-also-match-virt.patch | 28 ---------------- ...commit.c-fix-a-use-after-free-in-sta.patch | 30 ----------------- ...dictionary.c-get-installed_size-obj-.patch | 33 ------------------- ...004-xbps-install-revert-fa40928026bd.patch | 28 ---------------- srcpkgs/xbps/template | 9 +++-- 5 files changed, 4 insertions(+), 124 deletions(-) delete mode 100644 srcpkgs/xbps/patches/0001-xbps-uhelper-make-the-version-target-also-match-virt.patch delete mode 100644 srcpkgs/xbps/patches/0002-lib-transaction_commit.c-fix-a-use-after-free-in-sta.patch delete mode 100644 srcpkgs/xbps/patches/0003-lib-transaction_dictionary.c-get-installed_size-obj-.patch delete mode 100644 srcpkgs/xbps/patches/0004-xbps-install-revert-fa40928026bd.patch diff --git a/srcpkgs/xbps/patches/0001-xbps-uhelper-make-the-version-target-also-match-virt.patch b/srcpkgs/xbps/patches/0001-xbps-uhelper-make-the-version-target-also-match-virt.patch deleted file mode 100644 index 27de8a7fe7e..00000000000 --- a/srcpkgs/xbps/patches/0001-xbps-uhelper-make-the-version-target-also-match-virt.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e25216822bc51b5ff1a87cbe980d1a96843a3a93 Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Mon, 25 Mar 2013 21:11:30 +0100 -Subject: [PATCH] xbps-uhelper: make the 'version' target also match virtual - pkgs. - ---- - bin/xbps-uhelper/main.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bin/xbps-uhelper/main.c b/bin/xbps-uhelper/main.c -index f1eb111..25acd45 100644 ---- bin/xbps-uhelper/main.c -+++ bin/xbps-uhelper/main.c -@@ -155,8 +155,8 @@ main(int argc, char **argv) - if (argc != 2) - usage(); - -- dict = xbps_pkgdb_get_pkg(&xh, argv[1]); -- if (dict == NULL) -+ if ((((dict = xbps_pkgdb_get_pkg(&xh, argv[1])) == NULL)) && -+ (((dict = xbps_pkgdb_get_virtualpkg(&xh, argv[1])) == NULL))) - exit(EXIT_FAILURE); - - prop_dictionary_get_cstring_nocopy(dict, "pkgver", &version); --- -1.8.2 - diff --git a/srcpkgs/xbps/patches/0002-lib-transaction_commit.c-fix-a-use-after-free-in-sta.patch b/srcpkgs/xbps/patches/0002-lib-transaction_commit.c-fix-a-use-after-free-in-sta.patch deleted file mode 100644 index be66cae4b35..00000000000 --- a/srcpkgs/xbps/patches/0002-lib-transaction_commit.c-fix-a-use-after-free-in-sta.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7c4f20ba89bee94b5259df3b0b1af0bb1deeab0a Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Tue, 26 Mar 2013 10:35:20 +0100 -Subject: [PATCH] lib/transaction_commit.c: fix a use-after-free in state cb - (found by ojab). - ---- - lib/transaction_commit.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/transaction_commit.c b/lib/transaction_commit.c -index dd148b0..e1edf7b 100644 ---- lib/transaction_commit.c -+++ lib/transaction_commit.c -@@ -88,11 +88,11 @@ check_binpkgs_hash(struct xbps_handle *xhp, prop_object_iterator_t iter) - rv = xbps_file_hash_check(binfile, sha256); - if (rv != 0) { - free(binfile); -- free(filen); - xbps_set_cb_state(xhp, XBPS_STATE_VERIFY_FAIL, - rv, pkgver, - "Failed to verify `%s' package integrity: %s", - filen, strerror(rv)); -+ free(filen); - break; - } - free(binfile); --- -1.8.2 - diff --git a/srcpkgs/xbps/patches/0003-lib-transaction_dictionary.c-get-installed_size-obj-.patch b/srcpkgs/xbps/patches/0003-lib-transaction_dictionary.c-get-installed_size-obj-.patch deleted file mode 100644 index 7b5c09060f5..00000000000 --- a/srcpkgs/xbps/patches/0003-lib-transaction_dictionary.c-get-installed_size-obj-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 80de70d0cfc50aaa55f95d43a6ffcdfe8c363e18 Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Thu, 4 Apr 2013 10:40:32 +0200 -Subject: [PATCH 1/2] lib/transaction_dictionary.c: get installed_size obj from - pkg metadata correctly. - -This lead to incorrect sizes or no size when computing freed/installed size -in the transaction dictionary. ---- - lib/transaction_dictionary.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/transaction_dictionary.c b/lib/transaction_dictionary.c -index 6897c57..9aa5e72 100644 ---- lib/transaction_dictionary.c -+++ lib/transaction_dictionary.c -@@ -97,7 +97,12 @@ compute_transaction_stats(struct xbps_handle *xhp) - */ - if ((strcmp(tract, "remove") == 0) || - (strcmp(tract, "update") == 0)) { -- pkg_metad = xbps_pkgdb_get_pkg_metadata(xhp, pkgver); -+ char *pkgname; -+ -+ pkgname = xbps_pkg_name(pkgver); -+ assert(pkgname); -+ pkg_metad = xbps_pkgdb_get_pkg_metadata(xhp, pkgname); -+ free(pkgname); - if (pkg_metad == NULL) - continue; - prop_dictionary_get_uint64(pkg_metad, --- -1.8.2 - diff --git a/srcpkgs/xbps/patches/0004-xbps-install-revert-fa40928026bd.patch b/srcpkgs/xbps/patches/0004-xbps-install-revert-fa40928026bd.patch deleted file mode 100644 index 112b66d57ea..00000000000 --- a/srcpkgs/xbps/patches/0004-xbps-install-revert-fa40928026bd.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a0d50f542a8452b99284815f515e604b7ee3e03a Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Mon, 15 Apr 2013 21:02:33 +0200 -Subject: [PATCH] xbps-install: revert fa40928026bd. - -If a package is already installed and it's being installed without -f (force), -xbps-install must return EEXIST. - -xbps-src really expects this to ignore duplicated build dependencies. ---- - bin/xbps-install/transaction.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/bin/xbps-install/transaction.c b/bin/xbps-install/transaction.c -index 6afcad4..cc25e98 100644 ---- bin/xbps-install/transaction.c -+++ bin/xbps-install/transaction.c -@@ -218,7 +218,6 @@ install_new_pkg(struct xbps_handle *xhp, const char *pkg, bool reinstall) - if ((rv = xbps_transaction_install_pkg(xhp, pkg, reinstall)) != 0) { - if (rv == EEXIST) { - printf("Package `%s' already installed.\n", pkg); -- rv = 0; - } else if (rv == ENOENT) { - fprintf(stderr, "Unable to locate '%s' in " - "repository pool.\n", pkg); --- -1.8.2 - diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index eb741932b76..2043c57f813 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps -version=0.22 -revision=5 +version=0.23 +revision=1 build_style=configure configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin --enable-static --enable-debug --enable-tests" @@ -13,7 +13,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=717cd34e0ee42215e23d32e00098d64493488a247b631384fa233f12e647f6ca +checksum=29b3b391978f0d1f83c52b6bcb8aa094b15ea98003a9feaa08101776daaf9533 libxbps_package() { short_desc="${short_desc} - runtime library" @@ -57,7 +57,6 @@ xbps_package() { conf_files="/etc/xbps/xbps.conf" replaces="xbps>=0" pkg_install() { - vmove etc - vmove usr + vmove all } }