[arch-commits] Commit in mkinitcpio/trunk (2 files)

[Evangelos Foutras]

    Date: Wednesday, January 20, 2016 @ 08:55:11
  Author: foutrelis
Revision: 258437

upgpkg: mkinitcpio 19-1

New upstream release.

Modified:
  mkinitcpio/trunk/PKGBUILD
Deleted:
  mkinitcpio/trunk/0001-avoid-compound-conditional-leading-to-spurious-error.patch

-----------------------------------------------------------------+
 0001-avoid-compound-conditional-leading-to-spurious-error.patch |   39 ----------
 PKGBUILD                                                        |   19 +---
 2 files changed, 7 insertions(+), 51 deletions(-)

Deleted: 0001-avoid-compound-conditional-leading-to-spurious-error.patch
===================================================================
--- 0001-avoid-compound-conditional-leading-to-spurious-error.patch	2016-01-20 06:57:33 UTC (rev 258436)
+++ 0001-avoid-compound-conditional-leading-to-spurious-error.patch	2016-01-20 07:55:11 UTC (rev 258437)
@@ -1,39 +0,0 @@
-From ea4c4154205372154457c794513ae46b61ea4e4c Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner at archlinux.org>
-Date: Mon, 4 Aug 2014 08:31:37 -0400
-Subject: [mkinitcpio] [PATCH] avoid compound conditional leading to spurious
- "errors"
-
-As seen:
-
-https://bbs.archlinux.org/viewtopic.php?id=185204
-https://bbs.archlinux.org/viewtopic.php?id=185265
----
- functions | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/functions b/functions
-index 20bbffe..362d07b 100644
---- a/functions
-+++ b/functions
-@@ -423,11 +423,15 @@ add_full_dir() {
- 
-         for f in "$1"/*; do
-             if [[ -L $f ]]; then
--                [[ $f = $filter ]] && add_symlink "$f" "$(readlink "$f")"
-+                if [[ $f = $filter ]]; then
-+                    add_symlink "$f" "$(readlink "$f")"
-+                fi
-             elif [[ -d $f ]]; then
-                 add_full_dir "$f"
-             elif [[ -f $f ]]; then
--                [[ $f = $filter ]] && add_file "$f"
-+                if [[ $f = $filter ]]; then
-+                    add_file "$f"
-+                fi
-             fi
-         done
-     fi
--- 
-2.1.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-20 06:57:33 UTC (rev 258436)
+++ PKGBUILD	2016-01-20 07:55:11 UTC (rev 258437)
@@ -3,8 +3,8 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=mkinitcpio
-pkgver=18
-pkgrel=2
+pkgver=19
+pkgrel=1
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="https://projects.archlinux.org/mkinitcpio.git/"
@@ -17,18 +17,13 @@
             'lz4: Use lz4 compression for the initramfs image'
             'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
 backup=('etc/mkinitcpio.conf')
-source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-        '0001-avoid-compound-conditional-leading-to-spurious-error.patch')
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
 install=mkinitcpio.install
-sha256sums=('187bdeeade08996010fbff480ccc91e47722d275c22fd6feb4a4b63061e9fc22'
-            'SKIP'
-            'f6a77a34a5d97b8c3f3aef21b97da0b5d6992244e28e9b3f71e83cbaa4473341')
-validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53')  # Dave Reisner
+sha256sums=('7170e7a3d1b9ed21b0961941a327886febe80e62e2dfee6b88359ed72d0da620'
+            'SKIP')
+validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'   # Dave Reisner
+              '86CFFCA918CF3AF47147588051E8B148A9999C34')  # Evangelos Foutras
 
-prepare() {
-  patch -d "$pkgname-$pkgver" -Np1 <0001-avoid-compound-conditional-leading-to-spurious-error.patch
-}
-
 package() {
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }