Date: Monday, September 4, 2017 @ 08:49:11 Author: bpiotrowski Revision: 304643
23-2: make ldd parsing compatible with upstream glibc changes Added: mkinitcpio/trunk/0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch Modified: mkinitcpio/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch | 31 ++++++++++ PKGBUILD | 13 +++- 2 files changed, 41 insertions(+), 3 deletions(-) Added: 0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch =================================================================== --- 0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch (rev 0) +++ 0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch 2017-09-04 08:49:11 UTC (rev 304643) @@ -0,0 +1,31 @@ +From 32dbf895d07f07e32d2b3bb4afb132eea1919749 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreis...@archlinux.org> +Date: Mon, 21 Aug 2017 21:33:22 -0400 +Subject: [PATCH] make ldd parsing compatible with upstream glibc changes + +https://sourceware.org/git/?p=glibc.git;a=commit;h=eedca9772e99c72ab4c3c34e43cc764250aa3e3c +--- + functions | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/functions b/functions +index 0e1fe0f..941312f 100644 +--- a/functions ++++ b/functions +@@ -598,10 +598,10 @@ add_binary() { + ! lddout=$(ldd "$binary" 2>/dev/null) && return 0 + + # resolve sodeps +- regex='(/.+) \(0x[a-fA-F0-9]+\)' +- while read line; do ++ regex='^(|.+ )(/.+) \(0x[a-fA-F0-9]+\)' ++ while read -r line; do + if [[ $line =~ $regex ]]; then +- sodep=${BASH_REMATCH[1]} ++ sodep=${BASH_REMATCH[2]} + elif [[ $line = *'not found' ]]; then + error "binary dependency \`%s' not found for \`%s'" "${line%% *}" "$1" + (( ++_builderrors )) +-- +2.14.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-09-04 07:38:24 UTC (rev 304642) +++ PKGBUILD 2017-09-04 08:49:11 UTC (rev 304643) @@ -4,7 +4,7 @@ pkgname=mkinitcpio pkgver=23 -pkgrel=1 +pkgrel=2 pkgdesc="Modular initramfs image creation utility" arch=('any') url="https://projects.archlinux.org/mkinitcpio.git/" @@ -17,13 +17,20 @@ '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}) +source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + '0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch') install=mkinitcpio.install sha256sums=('80f12a07f0dceef81dfe87200f099bd2149e0990391dda6defebaa5697f8a35a' - 'SKIP') + 'SKIP' + 'f534892af930abf8164eead271dc012e42a552362fbb459e55e04d4a68b52a66') validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' # Dave Reisner '86CFFCA918CF3AF47147588051E8B148A9999C34') # Evangelos Foutras +prepare() { + cd "$pkgname-$pkgver" + patch -p1 -i ../0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch +} + check() { make -C "$pkgname-$pkgver" check }