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

[Dan McGee]

    Date: Friday, August 17, 2007 @ 16:33:10
  Author: dan
    Path: /home/cvs-arch/arch/build/base/pacman

   Added: pacman-cumulative.patch (1.1)
Modified: PKGBUILD (1.144 -> 1.145)
 Removed: chmod-fix.patch (1.1)

upgpkg: pacman 3.0.5-3


-------------------------+
 PKGBUILD                |   14 ++++++--------
 chmod-fix.patch         |   11 -----------
 pacman-cumulative.patch |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 19 deletions(-)


Index: arch/build/base/pacman/PKGBUILD
diff -u arch/build/base/pacman/PKGBUILD:1.144 arch/build/base/pacman/PKGBUILD:1.145
--- arch/build/base/pacman/PKGBUILD:1.144	Wed Jun 20 17:21:50 2007
+++ arch/build/base/pacman/PKGBUILD	Fri Aug 17 16:33:10 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.144 2007/06/20 21:21:50 dan Exp $
+# $Id: PKGBUILD,v 1.145 2007/08/17 20:33:10 dan Exp $
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=pacman
 pkgver=3.0.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
@@ -18,18 +18,16 @@
         etc/abs/supfile.{arch,extra,community,testing,unstable})
 install=pacman.install
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz \
-        chmod-fix.patch)
+        pacman-cumulative.patch)
 options=(!libtool)
 md5sums=('0e0c0e342bf9f811d9c80094c6f022cb'
-         'e7b5b6450d55f661bcf59a690544e966')
-sha1sums=('0bbf545828afd6e029c1eae0fe7309596c01c34e'
-          '1ea9ea1df12de8a235ccc5be310ed10b039d0010')
+         '779864037870c30ae3889a210c2cd4a2')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   
-  #fix the ugly chmod bug
-  patch -Np0 -i ../chmod-fix.patch || return 1
+  # fix a few issues since 3.0.5 release
+  patch -Np1 -i ../pacman-cumulative.patch || return 1
 
   # nothing fancy here
   ./configure --prefix=/usr --sysconfdir=/etc
Index: arch/build/base/pacman/chmod-fix.patch
diff -u arch/build/base/pacman/chmod-fix.patch:1.1 arch/build/base/pacman/chmod-fix.patch:removed
--- arch/build/base/pacman/chmod-fix.patch:1.1	Wed Jun 20 17:21:51 2007
+++ arch/build/base/pacman/chmod-fix.patch	Fri Aug 17 16:33:10 2007
@@ -1,11 +0,0 @@
---- 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-cumulative.patch
diff -u /dev/null arch/build/base/pacman/pacman-cumulative.patch:1.1
--- /dev/null	Fri Aug 17 16:33:10 2007
+++ arch/build/base/pacman/pacman-cumulative.patch	Fri Aug 17 16:33:10 2007
@@ -0,0 +1,46 @@
+Index: pacman-lib/configure.ac
+diff -u pacman-lib/configure.ac:1.42 pacman-lib/configure.ac:1.43
+--- pacman-lib/configure.ac:1.42	Sun Jun 17 20:15:36 2007
++++ pacman-lib/configure.ac	Tue Jul 10 11:08:33 2007
+@@ -148,6 +148,9 @@
+     AC_MSG_ERROR("libdownload is needed to compile pacman!");
+ fi
+ 
++# Enable large file support if available
++AC_SYS_LARGEFILE
++
+ dnl Set config location
+ AC_MSG_CHECKING(for configuration file name)
+ if test -n "$configfile"; then
+Index: pacman-lib/lib/libalpm/add.c
+diff -u pacman-lib/lib/libalpm/add.c:1.132 pacman-lib/lib/libalpm/add.c:1.134
+--- pacman-lib/lib/libalpm/add.c:1.132	Thu May 17 23:26:24 2007
++++ pacman-lib/lib/libalpm/add.c	Fri Aug 17 16:07:05 2007
+@@ -700,12 +700,12 @@
+ 
+ 					archive_entry_set_pathname(entry, filename);
+ 
+-					if(archive_read_extract(archive, entry, ARCHIVE_EXTRACT_FLAGS) != ARCHIVE_OK) {
++					int ret = archive_read_extract(archive, entry, 
++								ARCHIVE_EXTRACT_FLAGS | ARCHIVE_EXTRACT_NO_OVERWRITE);
++					if(ret != ARCHIVE_OK && ret != ARCHIVE_WARN) {
+ 						_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: pacman-lib/lib/libalpm/alpm.c
+diff -u pacman-lib/lib/libalpm/alpm.c:1.128 pacman-lib/lib/libalpm/alpm.c:1.129
+--- pacman-lib/lib/libalpm/alpm.c:1.128	Tue Apr  3 23:59:36 2007
++++ pacman-lib/lib/libalpm/alpm.c	Tue Jun 26 15:35:00 2007
+@@ -940,6 +940,7 @@
+ 			}
+ 			_alpm_strtrim(key);
+ 			strncpy(origkey, key, min(255, strlen(key)));
++			origkey[min(255, strlen(key))] = '\0';
+ 			key = _alpm_strtoupper(key);
+ 			if(!strlen(section) && strcmp(key, "INCLUDE")) {
+ 				RET_ERR(PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION, -1);