updpkg: nonsystemd/mkinitcpio 30-1.nonsystemd1

Signed-off-by: David P <megver83@parabola.nu>

3 files changed, 17 insertions, 112 deletions

diff --git a/nonsystemd/mkinitcpio/0001-mkinitcpio-remove-preset-pacsave.patch b/nonsystemd/mkinitcpio/0001-mkinitcpio-remove-preset-pacsave.patch
deleted file mode 100644
index e2f7efc30..000000000
--- a/nonsystemd/mkinitcpio/0001-mkinitcpio-remove-preset-pacsave.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/libalpm/scripts/mkinitcpio-remove b/libalpm/scripts/mkinitcpio-remove
-index 86838e4..17b4b31 100644
---- a/libalpm/scripts/mkinitcpio-remove
-+++ b/libalpm/scripts/mkinitcpio-remove
-@@ -2,6 +2,20 @@
- 
- package=0
- 
-+process_preset() {
-+    if [[ -n "${pkgbase}" && -e $preset ]]; then
-+        if ! cmp $preset > /dev/null 2>&1 <(sed "s|%PKGBASE%|${pkgbase}|g" /usr/share/mkinitcpio/hook.preset); then
-+            if [[ ! -e $preset.pacsave ]]; then
-+                # save the preset as pacsave
-+                mv $preset $preset.pacsave && return 0
-+            fi
-+        else
-+            # remove the preset
-+            rm $preset && return 0
-+        fi
-+    fi
-+}
-+
- while read -r line; do
-     if [[ $line != */vmlinuz ]]; then
-         # triggers when it's a change to usr/lib/initcpio/*
-@@ -23,17 +37,25 @@ while read -r line; do
-         # remove the installed kernel
-         rm $kernel
-     fi
--    if [[ -e $preset ]]; then
--        # remove the preset
--        rm $preset
-+
-+    process_preset "${pkgbase}" $preset
-+
-+    if [[ -e $initramfs ]]; then
-+        # remove the main image
-+        rm $initramfs
-     fi
--    if [[ -e $initramfs && -e $fallback_initramfs ]]; then
--        # remove the images
--        rm $initramfs $fallback_initramfs
-+    if [[ -e $fallback_initramfs ]]; then
-+        # remove the fallback image
-+        rm $fallback_initramfs
-     fi
- done
- 
- if (( package )) && compgen -G /etc/mkinitcpio.d/"*.preset" > /dev/null; then
--    # remove all presets
--    rm /etc/mkinitcpio.d/*.preset
-+    shopt -s nullglob
-+    for preset in /etc/mkinitcpio.d/*.preset; do
-+        pkgbase=${preset##*/}
-+        pkgbase=${pkgbase%.preset}
-+        process_preset "${pkgbase}" $preset
-+    done
-+    shopt -u nullglob
- fi
diff --git a/nonsystemd/mkinitcpio/0002-mkinitcpio-fix-builtin.patch b/nonsystemd/mkinitcpio/0002-mkinitcpio-fix-builtin.patch
deleted file mode 100644
index 3ee8d1f4f..000000000
--- a/nonsystemd/mkinitcpio/0002-mkinitcpio-fix-builtin.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 30dbfc2770cb49cb3babfb750205b126d7d88791 Mon Sep 17 00:00:00 2001
-From: Morten Linderud <morten@linderud.pw>
-Date: Thu, 20 Feb 2020 09:44:29 +0100
-Subject: [PATCH] [functions] Ignore modinfo built-in modules
-
-modinfo have started reporting filenames as "(builtin)" on built-in
-modules. Ignore these and continue with other modules.
-
-Fixes: https://bugs.archlinux.org/task/65564
-Introduced in: https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=e7e2cb61fa9f1db3429d91ef6accff549500d268
-
-Signed-off-by: Morten Linderud <morten@linderud.pw>
----
- functions | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/functions b/functions
-index f407c82..1c72b56 100644
---- a/functions
-+++ b/functions
-@@ -371,7 +371,7 @@ add_module() {
-     target=${1%.ko*} target=${target//-/_}
- 
-     # skip expensive stuff if this module has already been added
--    (( _addedmodules["$target"] == 1 )) && return
-+    (( _addedmodules["$target"] > 0 )) && return
- 
-     while IFS=':= ' read -r -d '' field value; do
-         case "$field" in
diff --git a/nonsystemd/mkinitcpio/PKGBUILD b/nonsystemd/mkinitcpio/PKGBUILD
index 82b98616e..96b40ce52 100644
--- a/nonsystemd/mkinitcpio/PKGBUILD
+++ b/nonsystemd/mkinitcpio/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: David P. <megver83@parabola.nu>
+# Maintainer (Arch): Giancarlo Razzolini <grazzolini@archlinux.org>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 # Maintainer (Arch): Thomas Bächler <thomas@archlinux.org>
+# Maintainer: David P. <megver83@parabola.nu>
 
 pkgname=mkinitcpio
-pkgver=27
-pkgrel=3
+pkgver=30
+pkgrel=1
 pkgrel+=.nonsystemd1
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
@@ -12,8 +13,9 @@ url="https://projects.archlinux.org/mkinitcpio.git/"
 license=('GPL')
 makedepends=('asciidoc')
 depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
-         'bash' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip' 'udev')
-optdepends=('xz: Use lzma or xz compression for the initramfs image'
+         'bash' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'zstd' 'udev')
+optdepends=('gzip: Use gzip compression for the initramfs image'
+            'xz: Use lzma or xz compression for the initramfs image'
             'bzip2: Use bzip2 compression for the initramfs image'
             'lzop: Use lzo compression for the initramfs image'
             'lz4: Use lz4 compression for the initramfs image'
@@ -21,29 +23,20 @@ optdepends=('xz: Use lzma or xz compression for the initramfs image'
 provides=('initramfs')
 backup=('etc/mkinitcpio.conf')
 source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-        nosystemd.patch
-        "0001-mkinitcpio-remove-preset-pacsave.patch"
-        "0002-mkinitcpio-fix-builtin.patch")
+        nosystemd.patch)
 install=mkinitcpio.install
-sha256sums=('e6bff1cb78b677538eb9aace900b715fd59de8fc210b74fb9d899dfaa32bc354'
+sha512sums=('ef43a8ddc01697fa43bede4eebad3271bbc89efa57ba7e4e9f321e8174ff2af74d857b308c5c0f37b42a91906c91c1b022f9a651c70d5d3e9dfc8dc441a60ee4'
             'SKIP'
-            'c4afeb6b3300c4d50c3f01233705b542f59d6e95a7670f7efde097ea209ef5bd'
-            '845569fa760f70c868ecb3dc8ae9667287970526dddaf403fdafcb716e8b3d51'
-            'd097f3df15ba9fefd3771f9f784e1c31c8d5ff1d9d6885a46fc6b5188e419796')
-validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'   # Dave Reisner
-              '86CFFCA918CF3AF47147588051E8B148A9999C34'   # Evangelos Foutras
-              'ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB')  # Giancarlo Razzolini
+            'f1ad7792b3b42397c2645e834d4b6c6a89122060455954d1ab56a71c673c3b8a8fdbbd6d722d30195211672b9075d09ac07ce6fb5d9723f56ce540709ebe4665')
+b2sums=('2001f9ac12bfa7369ad32842956cd21b2a786cd28133b6d3256e4aa77210c78ec6cac8a710ff8c2feb5a4797c1a33ce8c8c7dfabd84d7927c08bf8377e330300'
+        'SKIP'
+        '92e1969572e0022bd257f44314045f57db47821d99a40ea1290749967b50ead1cb11adaa9b79f4286fbf20a94173e0ba7f2d4f88208e31d7a03a8de4ea014396')
+validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB'    # Giancarlo Razzolini
+              '86CFFCA918CF3AF47147588051E8B148A9999C34')   # Evangelos Foutras
 
-prepare(){
+prepare() {
   cd $pkgname-$pkgver
-  # Apply 0001-mkinitcpio-remove-preset-pacsave.patch
-  patch -Np1 < $srcdir/0001-mkinitcpio-remove-preset-pacsave.patch
-
-  rm -rf install/sd-*
-  patch -Np1 -i $srcdir/nosystemd.patch
-
-  # Apply 0002-mkinitcpio-fix-builtin.patch
-  patch -Np1 < $srcdir/0002-mkinitcpio-fix-builtin.patch
+  patch -Np1 -i ../nosystemd.patch
 }
 
 check() {