From a76cebd1a51407defcbfd7168cd74eb2b9f9c721 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sun, 24 Jan 2016 12:42:57 +0100 Subject: [PATCH] mkinitcpio: update to 19. --- ...onditional-leading-to-spurious-error.patch | 39 ------------------- srcpkgs/mkinitcpio/template | 6 +-- 2 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 srcpkgs/mkinitcpio/patches/avoid-compound-conditional-leading-to-spurious-error.patch diff --git a/srcpkgs/mkinitcpio/patches/avoid-compound-conditional-leading-to-spurious-error.patch b/srcpkgs/mkinitcpio/patches/avoid-compound-conditional-leading-to-spurious-error.patch deleted file mode 100644 index c1371fd3247..00000000000 --- a/srcpkgs/mkinitcpio/patches/avoid-compound-conditional-leading-to-spurious-error.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ea4c4154205372154457c794513ae46b61ea4e4c Mon Sep 17 00:00:00 2001 -From: Dave Reisner -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 - diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template index 0b582f50aaa..a715383b056 100644 --- a/srcpkgs/mkinitcpio/template +++ b/srcpkgs/mkinitcpio/template @@ -1,7 +1,7 @@ # Template file for 'mkinitcpio' pkgname=mkinitcpio -version=18 -revision=7 +version=19 +revision=1 noarch=yes build_style=gnu-makefile depends="busybox-static bsdcpio bash" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://wiki.archlinux.org/index.php/Mkinitcpio" distfiles="https://sources.archlinux.org/other/$pkgname/$pkgname-$version.tar.gz" -checksum=187bdeeade08996010fbff480ccc91e47722d275c22fd6feb4a4b63061e9fc22 +checksum=7170e7a3d1b9ed21b0961941a327886febe80e62e2dfee6b88359ed72d0da620 conf_files="/etc/mkinitcpio.conf"