From 426410715c8e8b2e62afa737fdf24458a77f56df Mon Sep 17 00:00:00 2001
From: Matthias Rabault <matthias.rabault@mailoo.org>
Date: Sun, 27 Apr 2014 16:16:27 +0200
Subject: [PATCH] [glibc] Fix variable quoting in PKGBUILD

THe $srcdir, $pkgdir were unqoted, which introduces bugs if they contain
spaces
---
 glibc/trunk/PKGBUILD | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/glibc/trunk/PKGBUILD b/glibc/trunk/PKGBUILD
index 42ca17f..4c5a498 100644
--- a/glibc/trunk/PKGBUILD
+++ b/glibc/trunk/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.19
-pkgrel=4
+pkgrel=5
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc"
@@ -34,19 +34,19 @@ md5sums=('e26b8cc666b162f999404b03970f14e4'
          '476e9113489f93b348b21e144b6a8fcf')
 
 prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   
   # fix for {linux,sys}/xattr.h incompatibility - commit fdbe8eae
-  patch -p1 -i $srcdir/glibc-2.19-xattr_header.patch
+  patch -p1 -i "$srcdir"/glibc-2.19-xattr_header.patch
 
   # fix issues in sin/cos slow path calculation - commit ffe768a9
-  patch -p1 -i $srcdir/glibc-2.19-fix-sign-in-bsloww1-input.patch
+  patch -p1 -i "$srcdir"/glibc-2.19-fix-sign-in-bsloww1-input.patch
 
-  mkdir ${srcdir}/glibc-build
+  mkdir "${srcdir}"/glibc-build
 }
 
 build() {
-  cd ${srcdir}/glibc-build
+  cd "${srcdir}"/glibc-build
 
   if [[ ${CARCH} = "i686" ]]; then
     # Hack to fix NPTL issues with Xen, only required on 32bit platforms
@@ -92,7 +92,7 @@ check() {
   # the linker commands need to be reordered - fixed in 2.19
   LDFLAGS=${LDFLAGS/--as-needed,/}
 
-  cd ${srcdir}/glibc-build
+  cd "${srcdir}"/glibc-build
 
   # only acceptable testsuite error is some small libm ulp failures on i686 with gcc-4.9
   # TODO: fix upstream and provide patch
@@ -100,34 +100,34 @@ check() {
 }
 
 package() {
-  cd ${srcdir}/glibc-build
+  cd "${srcdir}"/glibc-build
 
-  install -dm755 ${pkgdir}/etc
-  touch ${pkgdir}/etc/ld.so.conf
+  install -dm755 "${pkgdir}"/etc
+  touch "${pkgdir}"/etc/ld.so.conf
 
-  make install_root=${pkgdir} install
+  make install_root="${pkgdir}" install
 
-  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
+  rm -f "${pkgdir}"/etc/ld.so.{cache,conf}
 
-  install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}
+  install -dm755 "${pkgdir}"/usr/lib/{locale,systemd/system,tmpfiles.d}
 
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.service ${pkgdir}/usr/lib/systemd/system
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
+  install -m644 "${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf" "${pkgdir}/etc/nscd.conf"
+  install -m644 "${srcdir}/${pkgname}-${pkgver}/nscd/nscd.service" "${pkgdir}/usr/lib/systemd/system"
+  install -m644 "${srcdir}/${pkgname}-${pkgver}/nscd/nscd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/nscd.conf"
 
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf
+  install -m644 "${srcdir}/${pkgname}-${pkgver}/posix/gai.conf" "${pkgdir}/etc/gai.conf"
 
-  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin
+  install -m755 "${srcdir}/locale-gen" "${pkgdir}/usr/bin"
 
   # create /etc/locale.gen
-  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
+  install -m644 "${srcdir}/locale.gen.txt" "${pkgdir}/etc/locale.gen"
   sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
-    ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
+    "${srcdir}/glibc-${pkgver}/localedata/SUPPORTED" >> "${pkgdir}/etc/locale.gen"
 
   # remove the static libraries that have a shared counterpart
   # libc, libdl, libm and libpthread are required for toolchain testsuites
   # in addition libcrypt appears widely required
-  rm $pkgdir/usr/lib/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a
+  rm "$pkgdir/usr/lib/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a"
 
   # Do not strip the following files for improved debugging support
   # ("improved" as in not breaking gdb and valgrind...):
@@ -136,7 +136,7 @@ package() {
   #   libpthread-${pkgver}.so
   #   libthread_db-1.0.so
 
-  cd $pkgdir
+  cd "$pkgdir"
   strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \
                         usr/bin/{ldconfig,locale,localedef,nscd,makedb} \
                         usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \
-- 
1.9.2