[arch-commits] CVS update of arch/build/base/pacman (3 files)

[Dan McGee]

    Date: Wednesday, June 20, 2007 @ 17:21:51
  Author: dan
    Path: /home/cvs-arch/arch/build/base/pacman

   Added: chmod-fix.patch (1.1)
Modified: PKGBUILD (1.143 -> 1.144) pacman.install (1.9 -> 1.10)

upgpkg: pacman 3.0.5-2


-----------------+
 PKGBUILD        |   18 ++++++++++++------
 chmod-fix.patch |   11 +++++++++++
 pacman.install  |    7 +++++++
 3 files changed, 30 insertions(+), 6 deletions(-)


Index: arch/build/base/pacman/PKGBUILD
diff -u arch/build/base/pacman/PKGBUILD:1.143 arch/build/base/pacman/PKGBUILD:1.144
--- arch/build/base/pacman/PKGBUILD:1.143	Sun Jun 17 20:28:38 2007
+++ arch/build/base/pacman/PKGBUILD	Wed Jun 20 17:21:50 2007
@@ -1,29 +1,35 @@
-# $Id: PKGBUILD,v 1.143 2007/06/18 00:28:38 dan Exp $
+# $Id: PKGBUILD,v 1.144 2007/06/20 21:21:50 dan Exp $
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=pacman
 pkgver=3.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 makedepends=(doxygen)
-depends=(fakeroot libarchive libdownload)
+depends=('fakeroot' 'libarchive>=2.2.3' 'libdownload')
 replaces=(pacman-rc)
 conflicts=(pacman-rc)
 backup=(etc/pacman.conf etc/makepkg.conf etc/abs/abs.conf
         etc/pacman.d/{current,release,extra,unstable,community,testing}
         etc/abs/supfile.{arch,extra,community,testing,unstable})
 install=pacman.install
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz \
+        chmod-fix.patch)
 options=(!libtool)
-md5sums=('0e0c0e342bf9f811d9c80094c6f022cb')
-sha1sums=('0bbf545828afd6e029c1eae0fe7309596c01c34e')
+md5sums=('0e0c0e342bf9f811d9c80094c6f022cb'
+         'e7b5b6450d55f661bcf59a690544e966')
+sha1sums=('0bbf545828afd6e029c1eae0fe7309596c01c34e'
+          '1ea9ea1df12de8a235ccc5be310ed10b039d0010')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  
+  #fix the ugly chmod bug
+  patch -Np0 -i ../chmod-fix.patch || return 1
 
   # nothing fancy here
   ./configure --prefix=/usr --sysconfdir=/etc
Index: arch/build/base/pacman/chmod-fix.patch
diff -u /dev/null arch/build/base/pacman/chmod-fix.patch:1.1
--- /dev/null	Wed Jun 20 17:21:50 2007
+++ arch/build/base/pacman/chmod-fix.patch	Wed Jun 20 17:21:51 2007
@@ -0,0 +1,11 @@
+--- lib/libalpm/add.c.orig	2007-06-20 17:11:47.000000000 -0400
++++ lib/libalpm/add.c	2007-06-20 17:11:59.000000000 -0400
+@@ -704,8 +704,6 @@
+ 						_alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"), filename, strerror(errno));
+ 						alpm_logaction(_("error: could not extract %s (%s)"), filename, strerror(errno));
+ 						errors++;
+-					} else {
+-						chmod(filename, archive_entry_mode(entry));
+ 					}
+ 
+ 					/* calculate an hash if this is in newpkg's backup */
Index: arch/build/base/pacman/pacman.install
diff -u arch/build/base/pacman/pacman.install:1.9 arch/build/base/pacman/pacman.install:1.10
--- arch/build/base/pacman/pacman.install:1.9	Mon Jun  4 16:25:41 2007
+++ arch/build/base/pacman/pacman.install	Wed Jun 20 17:21:51 2007
@@ -25,6 +25,13 @@
 	echo ">>> build packages for others with gcc4.2. Use \"-mtune=native\" for local"
 	echo ">>> optimised builds. Check the /etc/makepkg.conf.pacnew file."
   fi
+  if [ "$(vercmp $2 3.0.5-1)" -eq 0 ]; then
+    echo ">>> VERY IMPORTANT <<<"
+	echo ">>> pacman 3.0.5-1 had a bad bug when dealing with symlinks in packages,"
+	echo ">>> causing possible dangerious file permissions. It is recommended you"
+	echo ">>> reinstall any packages you have installed since upgrading to version"
+	echo ">>> 3.0.5-1. Use /var/log/pacman.log for this information."
+  fi
 }
 
 _rankmirrors() {