[arch-commits] Commit in supermin/repos/community-x86_64 (4 files)
Robin Broda
coderobe at archlinux.org
Wed May 6 14:37:59 UTC 2020
Date: Wednesday, May 6, 2020 @ 14:37:58
Author: coderobe
Revision: 625055
archrelease: copy trunk to community-x86_64
Added:
supermin/repos/community-x86_64/PKGBUILD
(from rev 625054, supermin/trunk/PKGBUILD)
supermin/repos/community-x86_64/pacman-iter.patch
(from rev 625054, supermin/trunk/pacman-iter.patch)
Deleted:
supermin/repos/community-x86_64/PKGBUILD
supermin/repos/community-x86_64/fix-cachedir-handling.patch
-----------------------------+
PKGBUILD | 80 +++++++++++++++++++++---------------------
fix-cachedir-handling.patch | 39 --------------------
pacman-iter.patch | 67 +++++++++++++++++++++++++++++++++++
3 files changed, 107 insertions(+), 79 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-06 14:37:47 UTC (rev 625054)
+++ PKGBUILD 2020-05-06 14:37:58 UTC (rev 625055)
@@ -1,40 +0,0 @@
-# Maintainer: Robin Broda <coderobe @ archlinux.org>
-# Contributor: Xiao-Long Chen <chenxiaolong at cxl.epac.to>
-# Contributor: Achilleas Pipinellis <axilleas archlinux gr>
-
-pkgname=supermin
-pkgver=5.2.0
-pkgrel=1
-pkgdesc="Tool for creating supermin appliances"
-arch=('x86_64')
-url="http://people.redhat.com/~rjones/supermin/"
-license=('GPL')
-makedepends=('ocaml' 'ocaml-findlib' 'cpio')
-depends=('e2fsprogs' 'pacman' 'pacman-contrib')
-conflicts=('febootstrap<=3.21')
-source=("http://download.libguestfs.org/${pkgname}/5.2-stable/${pkgname}-${pkgver}.tar.gz"{,.sig}
- "fix-cachedir-handling.patch")
-sha512sums=('782d00f95a37ad75833b659300b085b5c7bfa1c795eae9aa57b3c52cab0332d6e6b8e1bddc5b1c0075cc64b60e22b64387771cd9f457568408889244a4628467'
- 'SKIP'
- '24ce2fb779008afc411efb6a6f2e9dac7dae122281c8159abd426e1eb1c82d0ada98e38db0238b6ef3efd8b2dd345fe1786424a44cff293e1b86a1f147930dfc')
-validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0') # Richard W.M. Jones <rjones at redhat.com>
-
-prepare() {
- cd "${pkgname}-${pkgver}"
-
- patch src/ph_pacman.ml "${srcdir}/fix-cachedir-handling.patch"
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr
-
- make
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}/" install
-}
Copied: supermin/repos/community-x86_64/PKGBUILD (from rev 625054, supermin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-05-06 14:37:58 UTC (rev 625055)
@@ -0,0 +1,40 @@
+# Maintainer: Robin Broda <coderobe @ archlinux.org>
+# Contributor: Xiao-Long Chen <chenxiaolong at cxl.epac.to>
+# Contributor: Achilleas Pipinellis <axilleas archlinux gr>
+
+pkgname=supermin
+pkgver=5.2.0
+pkgrel=2
+pkgdesc="Tool for creating supermin appliances"
+arch=('x86_64')
+url="http://people.redhat.com/~rjones/supermin/"
+license=('GPL')
+makedepends=('ocaml' 'ocaml-findlib' 'cpio')
+depends=('e2fsprogs' 'pacman' 'pacman-contrib')
+conflicts=('febootstrap<=3.21')
+source=("http://download.libguestfs.org/${pkgname}/5.2-stable/${pkgname}-${pkgver}.tar.gz"{,.sig}
+ "pacman-iter.patch")
+sha512sums=('782d00f95a37ad75833b659300b085b5c7bfa1c795eae9aa57b3c52cab0332d6e6b8e1bddc5b1c0075cc64b60e22b64387771cd9f457568408889244a4628467'
+ 'SKIP'
+ 'cec4e3fa3a82393397fc73b3e99fa4bbc17805f0a08917564cf456060349e56699f69a69a68e1523a052d8d27764cc7bcf619c6b83ff90c664c4784afafab337')
+validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0') # Richard W.M. Jones <rjones at redhat.com>
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+
+ patch src/ph_pacman.ml "${srcdir}/pacman-iter.patch"
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr
+
+ make
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}/" install
+}
Deleted: fix-cachedir-handling.patch
===================================================================
--- fix-cachedir-handling.patch 2020-05-06 14:37:47 UTC (rev 625054)
+++ fix-cachedir-handling.patch 2020-05-06 14:37:58 UTC (rev 625055)
@@ -1,39 +0,0 @@
-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;
Copied: supermin/repos/community-x86_64/pacman-iter.patch (from rev 625054, supermin/trunk/pacman-iter.patch)
===================================================================
--- pacman-iter.patch (rev 0)
+++ pacman-iter.patch 2020-05-06 14:37:58 UTC (rev 625055)
@@ -0,0 +1,67 @@
+--- 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,25 @@
+ * 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
++ 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 -> " --config tmp.conf --dbpath var/lib/pacman"
++ | 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