Date: Wednesday, August 10, 2011 @ 09:31:06 Author: dreisner Revision: 135145
upgpkg: pacman 3.5.4-2 rebuild for makepkg fix, release -2 Added: pacman/trunk/0001-makepkg-fix-removing-symbolic-link.patch Modified: pacman/trunk/PKGBUILD -----------------------------------------------+ 0001-makepkg-fix-removing-symbolic-link.patch | 32 ++++++++++++++++++++++++ PKGBUILD | 11 ++++++-- 2 files changed, 40 insertions(+), 3 deletions(-) Added: 0001-makepkg-fix-removing-symbolic-link.patch =================================================================== --- 0001-makepkg-fix-removing-symbolic-link.patch (rev 0) +++ 0001-makepkg-fix-removing-symbolic-link.patch 2011-08-10 13:31:06 UTC (rev 135145) @@ -0,0 +1,32 @@ +From c493eef643ecb3a54c79083c51a8975f816ed9de Mon Sep 17 00:00:00 2001 +From: Allan McRae <[email protected]> +Date: Tue, 28 Jun 2011 22:47:35 +1000 +Subject: [PATCH] makepkg: fix removing symbolic link + +The path was not being stripped from $file before prefixing with +$srcdir resulting in the attempted removal of a very weird +filename. + +Signed-off-by: Allan McRae <[email protected]> +Signed-off-by: Dan McGee <[email protected]> +(cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c) +--- + scripts/makepkg.sh.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in +index 3ace945..b0b0882 100644 +--- a/scripts/makepkg.sh.in ++++ b/scripts/makepkg.sh.in +@@ -509,7 +509,7 @@ download_sources() { + local file=$(get_filepath "$netfile" || true) + if [[ -n "$file" ]]; then + msg2 "$(gettext "Found %s")" "${file##*/}" +- rm -f "$srcdir/$file" ++ rm -f "$srcdir/${file##*/}" + ln -s "$file" "$srcdir/" + continue + fi +-- +1.7.6 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-10 13:03:25 UTC (rev 135144) +++ PKGBUILD 2011-08-10 13:31:06 UTC (rev 135145) @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.4 -pkgrel=1 +pkgrel=2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/"; @@ -18,17 +18,22 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf pacman.conf.x86_64 - makepkg.conf) + makepkg.conf + 0001-makepkg-fix-removing-symbolic-link.patch) md5sums=('2dd3a85d55ee3dd89abd349aa837447c' 'e99eb721b6b704f68c5f47468507c102' 'f8b939d9b2beb79a0436961a2d707d7c' - 'a8684989d3dfad5a6e1bcf95af3e571b') + 'a8684989d3dfad5a6e1bcf95af3e571b' + '749a4ddc6d8418d8d031f1c9b4e09d6f') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' build() { cd $srcdir/$pkgname-$pkgver + + patch -Np1 < "$srcdir/0001-makepkg-fix-removing-symbolic-link.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-doc make
