Date: Monday, October 14, 2019 @ 19:50:05
Author: coderobe
Revision: 515904
upgpkg: supermin 5.1.20-3
supermin: fix pacman handler loop
Added:
supermin/trunk/pacman-iter.patch
Modified:
supermin/trunk/PKGBUILD
---+
PKGBUILD | 14 ---
pacman-iter.patch | 66
2 files changed, 77 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-14 19:48:41 UTC (rev 515903)
+++ PKGBUILD2019-10-14 19:50:05 UTC (rev 515904)
@@ -4,7 +4,7 @@
pkgname=supermin
pkgver=5.1.20
-pkgrel=2
+pkgrel=3
pkgdesc="Tool for creating supermin appliances"
arch=('x86_64')
url="http://people.redhat.com/~rjones/supermin/";
@@ -12,11 +12,19 @@
makedepends=('ocaml' 'ocaml-findlib' 'cpio')
depends=('e2fsprogs')
conflicts=('febootstrap<=3.21')
-source=("http://libguestfs.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+source=("http://libguestfs.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
+"pacman-iter.patch")
sha512sums=('ccc9ada98593f91399b323f0beb027185874f82547a1df4274c1206a9b6d4465e98b7aef5618274d41fb902747f6843fd2cc6192a4ea8526811261ac5a16848e'
-'SKIP')
+'SKIP'
+
'1921a5373c2a251048224871fcc9ccf2f3420ba444e6f0673e4efda2e7036cd31235c981c41f185ce15f6d5e0de2dd8c84290c410e12714b87992c150b799ad3')
validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0') # Richard W.M. Jones
+prepare() {
+ cd "${pkgname}-${pkgver}"
+
+ patch src/ph_pacman.ml "${srcdir}/pacman-iter.patch"
+}
+
build() {
cd "${pkgname}-${pkgver}"
Added: pacman-iter.patch
===
--- pacman-iter.patch (rev 0)
+++ pacman-iter.patch 2019-10-14 19:50:05 UTC (rev 515904)
@@ -0,0 +1,66 @@
+--- a/supermin/src/ph_pacman.ml2019-10-14 21:28:25.138769513 +0200
b/supermin/src/ph_pacman.ml2019-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
+-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
++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
+@@ -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 =