[arch-commits] Commit in supermin/trunk (3 files)
Robin Broda
coderobe at archlinux.org
Wed May 6 12:03:45 UTC 2020
Date: Wednesday, May 6, 2020 @ 12:03:45
Author: coderobe
Revision: 625037
upgpkg: supermin 5.2.0-1
Added:
supermin/trunk/fix-cachedir-handling.patch
Modified:
supermin/trunk/PKGBUILD
Deleted:
supermin/trunk/pacman-iter.patch
-----------------------------+
PKGBUILD | 14 ++++----
fix-cachedir-handling.patch | 39 ++++++++++++++++++++++++
pacman-iter.patch | 66 ------------------------------------------
3 files changed, 46 insertions(+), 73 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-06 11:47:33 UTC (rev 625036)
+++ PKGBUILD 2020-05-06 12:03:45 UTC (rev 625037)
@@ -3,8 +3,8 @@
# Contributor: Achilleas Pipinellis <axilleas archlinux gr>
pkgname=supermin
-pkgver=5.1.20
-pkgrel=4
+pkgver=5.2.0
+pkgrel=1
pkgdesc="Tool for creating supermin appliances"
arch=('x86_64')
url="http://people.redhat.com/~rjones/supermin/"
@@ -12,17 +12,17 @@
makedepends=('ocaml' 'ocaml-findlib' 'cpio')
depends=('e2fsprogs' 'pacman' 'pacman-contrib')
conflicts=('febootstrap<=3.21')
-source=("http://libguestfs.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
- "pacman-iter.patch")
-sha512sums=('ccc9ada98593f91399b323f0beb027185874f82547a1df4274c1206a9b6d4465e98b7aef5618274d41fb902747f6843fd2cc6192a4ea8526811261ac5a16848e'
+source=("http://download.libguestfs.org/${pkgname}/5.2-stable/${pkgname}-${pkgver}.tar.gz"{,.sig}
+ "fix-cachedir-handling.patch")
+sha512sums=('782d00f95a37ad75833b659300b085b5c7bfa1c795eae9aa57b3c52cab0332d6e6b8e1bddc5b1c0075cc64b60e22b64387771cd9f457568408889244a4628467'
'SKIP'
- '1921a5373c2a251048224871fcc9ccf2f3420ba444e6f0673e4efda2e7036cd31235c981c41f185ce15f6d5e0de2dd8c84290c410e12714b87992c150b799ad3')
+ '24ce2fb779008afc411efb6a6f2e9dac7dae122281c8159abd426e1eb1c82d0ada98e38db0238b6ef3efd8b2dd345fe1786424a44cff293e1b86a1f147930dfc')
validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0') # Richard W.M. Jones <rjones at redhat.com>
prepare() {
cd "${pkgname}-${pkgver}"
- patch src/ph_pacman.ml "${srcdir}/pacman-iter.patch"
+ patch src/ph_pacman.ml "${srcdir}/fix-cachedir-handling.patch"
}
build() {
Added: fix-cachedir-handling.patch
===================================================================
--- fix-cachedir-handling.patch (rev 0)
+++ fix-cachedir-handling.patch 2020-05-06 12:03:45 UTC (rev 625037)
@@ -0,0 +1,39 @@
+From c05b77000f6a13ac2932121bd625574eea6d5a80 Mon Sep 17 00:00:00 2001
+From: Geoff Toole <toolybird at tuta.io>
+Date: Sun, 19 Apr 2020 16:40:50 +1000
+Subject: [PATCH] pacman: Fix pacman CacheDir handling
+
+Downloads fail when CacheDir directives are present in /etc/pacman.conf
+Filter them out using pacman-conf.
+---
+ src/ph_pacman.ml | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/ph_pacman.ml b/src/ph_pacman.ml
+index c35668a..b4a6ac0 100644
+--- a/src/ph_pacman.ml
++++ b/src/ph_pacman.ml
+@@ -170,6 +170,8 @@ let pacman_download_all_packages pkgs dir =
+ (* Because we reuse the same temporary download directory (tdir), this
+ * only downloads each package once, even though each call to pacman will
+ * download dependent packages as well.
++ *
++ * CacheDir directives must be filtered out to force pacman downloads.
+ *)
+ List.iter (
+ fun name ->
+@@ -178,12 +180,13 @@ let pacman_download_all_packages pkgs dir =
+ umask 0000
+ cd %s
+ mkdir -p var/lib/pacman
++ pacman-conf | grep -v CacheDir > tmp.conf
+ %s %s%s -Syw --noconfirm --cachedir=$(pwd) --root=$(pwd) %s
+ "
+ (quote tdir)
+ Config.fakeroot Config.pacman
+ (match !settings.packager_config with
+- | None -> ""
++ | None -> " --config tmp.conf --dbpath var/lib/pacman"
+ | Some filename -> " --config " ^ (quote filename))
+ (quoted_list names) in
+ if !settings.debug >= 2 then printf "%s" cmd;
Deleted: pacman-iter.patch
===================================================================
--- pacman-iter.patch 2020-05-06 11:47:33 UTC (rev 625036)
+++ pacman-iter.patch 2020-05-06 12:03:45 UTC (rev 625037)
@@ -1,66 +0,0 @@
---- a/supermin/src/ph_pacman.ml 2019-10-14 21:28:25.138769513 +0200
-+++ b/supermin/src/ph_pacman.ml 2019-10-14 21:33:31.479364225 +0200
-@@ -171,24 +171,24 @@
- * only downloads each package once, even though each call to pacman will
- * download dependent packages as well.
- *)
-- List.iter (
-- fun name ->
-- let cmd = sprintf "\
-- set -e
-- umask 0000
-- cd %s
-- mkdir -p var/lib/pacman
-- %s %s%s -Syw --noconfirm --cachedir=$(pwd) --root=$(pwd) %s
-- "
-- (quote tdir)
-- Config.fakeroot Config.pacman
-- (match !settings.packager_config with
-- | None -> ""
-- | Some filename -> " --config " ^ (quote filename))
-- (quoted_list names) in
-- if !settings.debug >= 2 then printf "%s" cmd;
-- if Sys.command cmd <> 0 then (
-- (* The package may not be in the main repos, check the AUR. *)
-+ let cmd = sprintf "\
-+ set -e
-+ umask 0000
-+ cd %s
-+ mkdir -p var/lib/pacman
-+ %s %s%s -Syw --noconfirm --cachedir=$(pwd) --root=$(pwd) %s
-+ "
-+ (quote tdir)
-+ Config.fakeroot Config.pacman
-+ (match !settings.packager_config with
-+ | None -> ""
-+ | Some filename -> " --config " ^ (quote filename))
-+ (quoted_list names) in
-+ if !settings.debug >= 2 then printf "%s" cmd;
-+ if Sys.command cmd <> 0 then (
-+ (* The package may not be in the main repos, check the AUR. *)
-+ List.iter (
-+ fun name ->
- let cmd = sprintf "\
- set -e
- umask 0000
-@@ -201,16 +201,16 @@
- "
- (quote tdir)
- (quote ("https://aur.archlinux.org/packages/" ^
-- (String.sub name 0 2) ^
-- "/" ^ name ^ "/" ^ name ^ ".tar.gz"))
-+ (String.sub name 0 2) ^
-+ "/" ^ name ^ "/" ^ name ^ ".tar.gz"))
- (quote (name ^ ".tar.gz"))
- (quote name) (* cd *)
- Config.makepkg
- (quote name) (quote tdir) (* mv *) in
- if !settings.debug >= 2 then printf "%s" cmd;
- run_command cmd
-- );
-- ) names;
-+ ) names;
-+ );
-
- (* Unpack the downloaded packages. *)
- let cmd =
More information about the arch-commits
mailing list