sync with 19-1

4 files changed, 14 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f1b6e447a42..6654bc7e3cda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
+# Generated by mksrcinfo v8
+# Wed Feb 17 21:11:34 UTC 2016
 pkgbase = mkinitcpio-nosystemd
 	pkgdesc = Modular initramfs image creation utility
-	pkgver = 18
-	pkgrel = 2
+	pkgver = 19
+	pkgrel = 1
 	url = https://projects.archlinux.org/mkinitcpio.git/
 	install = mkinitcpio.install
 	arch = any
 	license = GPL
-	makedepends = asciidoc
 	depends = awk
 	depends = mkinitcpio-busybox>=1.19.4-2
 	depends = kmod
@@ -23,16 +24,12 @@ pkgbase = mkinitcpio-nosystemd
 	optdepends = lzop: Use lzo compression for the initramfs image
 	optdepends = lz4: Use lz4 compression for the initramfs image
 	optdepends = mkinitcpio-nfs-utils: Support for root filesystem on NFS
-	provides = mkinitcpio=18-2
-	conflicts = mkinitcpio
 	backup = etc/mkinitcpio.conf
-	source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-18.tar.gz
-	source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-18.tar.gz.sig
-	source = 0001-avoid-compound-conditional-leading-to-spurious-error.patch
-	source = 0002-remove-systemd.patch
-	sha256sums = 187bdeeade08996010fbff480ccc91e47722d275c22fd6feb4a4b63061e9fc22
+	source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-19.tar.gz
+	source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-19.tar.gz.sig
+	source = remove-systemd.patch
+	sha256sums = 7170e7a3d1b9ed21b0961941a327886febe80e62e2dfee6b88359ed72d0da620
 	sha256sums = SKIP
-	sha256sums = f6a77a34a5d97b8c3f3aef21b97da0b5d6992244e28e9b3f71e83cbaa4473341
 	sha256sums = 4921518d130b73724645b3732ba471005b8755a89a219bb6396e3b082414bb78
 
 pkgname = mkinitcpio-nosystemd
diff --git a/0001-avoid-compound-conditional-leading-to-spurious-error.patch b/0001-avoid-compound-conditional-leading-to-spurious-error.patch
deleted file mode 100644
index c1371fd32477..000000000000
--- a/0001-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 <dreisner@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
-
diff --git a/PKGBUILD b/PKGBUILD
index 12afe536fb98..6784a0a8cf4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # that doesn't depend on systemd
 
 pkgname=mkinitcpio-nosystemd
-pkgver=18
-pkgrel=2
+pkgver=19
+pkgrel=1
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="https://projects.archlinux.org/mkinitcpio.git/"
@@ -18,18 +18,13 @@ optdepends=('xz: Use lzma or xz compression for the initramfs image'
             'lzop: Use lzo compression for the initramfs image'
             'lz4: Use lz4 compression for the initramfs image'
             'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
-makedepends=('asciidoc')
-provides=("mkinitcpio=${pkgver}-${pkgrel}")
-conflicts=('mkinitcpio')
 backup=('etc/mkinitcpio.conf')
 source=("https://sources.archlinux.org/other/${pkgname%-nosystemd}/${pkgname%-nosystemd}-$pkgver.tar.gz"{,.sig}
-        '0001-avoid-compound-conditional-leading-to-spurious-error.patch'
- 		'0002-remove-systemd.patch'
+ 		'remove-systemd.patch'
 		)
 install=mkinitcpio.install
-sha256sums=('187bdeeade08996010fbff480ccc91e47722d275c22fd6feb4a4b63061e9fc22'
+sha256sums=('7170e7a3d1b9ed21b0961941a327886febe80e62e2dfee6b88359ed72d0da620'
             'SKIP'
-            'f6a77a34a5d97b8c3f3aef21b97da0b5d6992244e28e9b3f71e83cbaa4473341'
 			'4921518d130b73724645b3732ba471005b8755a89a219bb6396e3b082414bb78'
 			)
 
@@ -39,11 +34,9 @@ prepare() {
   [ ! -h "$d" ] && ln -s ${pkgname%-nosystemd}-${pkgver} "$d"
   [ ! -d "$d" ] && echo "!!!!! cannot locate dir '$d'" && exit 666
   rm -rf ${d}/install/sd-vconsole ${d}/install/sd-shutdown ${d}/systemd ${d}/tmpfiles
-  patch -d "$pkgname-$pkgver" -Np1 <0002-remove-systemd.patch
+  patch -d "$pkgname-$pkgver" -Np1 <remove-systemd.patch
   #end removing systemd related stuff
-  patch -d "$pkgname-$pkgver" -Np1 <0001-avoid-compound-conditional-leading-to-spurious-error.patch
 }
-
 package() {
-  make -C "${pkgname}-$pkgver" DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }
diff --git a/0002-remove-systemd.patch b/remove-systemd.patch
index f9a989cd55f0..f9a989cd55f0 100644
--- a/0002-remove-systemd.patch
+++ b/remove-systemd.patch