Imported from pacman-2.9.7-TEST2.tar.gz

5 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 0904c43d..eaab95f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
 2.9.7         - patch from Miklos Vanja fixed md5sums on x86_64
               - patch from Miklos Vanja adds --sudosync to makepkg
+              - patch from Jason Chu adds SHA1 hashes to PKGBUILDs
               - changed license field to operate as an array, not a string
               - added more logic for file conflict checks - if one target
                 is a file and the other is a directory, then it's a conflict
diff --git a/etc/makepkg.conf b/etc/makepkg.conf
index 5f787397..081ad038 100644
--- a/etc/makepkg.conf
+++ b/etc/makepkg.conf
@@ -16,8 +16,8 @@ export CFLAGS="-march=i686 -O2 -pipe"
 export CXXFLAGS="-march=i686 -O2 -pipe"
 # Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon optimized (but binaries
 # will run on any x86 system)
-#export CFLAGS="-mcpu=i686 -O2 -pipe"
-#export CXXFLAGS="-mcpu=i686 -O2 -pipe"
+#export CFLAGS="-mtune=i686 -O2 -pipe"
+#export CXXFLAGS="-mtune=i686 -O2 -pipe"
 
 # SMP Systems
 #export MAKEFLAGS="-j 2"
diff --git a/scripts/makepkg b/scripts/makepkg
index 0361e8bd..e9c764c1 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -590,6 +590,7 @@ fi
 cd $startdir
 rm -rf pkg/usr/info pkg/usr/share/info
 rm -rf pkg/usr/doc pkg/usr/share/doc
+rm -rf pkg/{usr,opt/gnome}/share/gtk-doc
 
 # move /usr/share/man files to /usr/man
 if [ -d pkg/usr/share/man ]; then
diff --git a/src/db.c b/src/db.c
index 82e76318..4d5c4e22 100644
--- a/src/db.c
+++ b/src/db.c
@@ -779,7 +779,11 @@ PMList* db_find_conflicts(pacdb_t *db, PMList *targets, char *root, PMList **ski
 					 * is not (or vice versa) then it's a conflict
 					 */
 					ok = 0;
-				} else if(S_ISDIR(buf.st_mode)) {
+					goto donecheck;
+				}
+				/* re-fetch with stat() instead of lstat() */
+				stat(path, &buf);
+				if(S_ISDIR(buf.st_mode)) {
 					/* if it's a directory, then we have no conflict */
 					ok = 1;
 				} else {
@@ -845,6 +849,7 @@ PMList* db_find_conflicts(pacdb_t *db, PMList *targets, char *root, PMList **ski
 						}
 					}
 				}
+donecheck:
 				if(!ok) {
 					MALLOC(str, 512);
 					snprintf(str, 512, "%s: %s: exists in filesystem", p->name, path);
diff --git a/src/pacman.c b/src/pacman.c
index b8d8eed5..6ab8d3cf 100644
--- a/src/pacman.c
+++ b/src/pacman.c
@@ -693,7 +693,7 @@ int pacman_sync(pacdb_t *db, PMList *targets)
 			cmp = rpmvercmp(local->version, sync->pkg->version);
 			if(cmp > 0 && !sync->pkg->force) {
 				/* local version is newer */
-				fprintf(stderr, ":: %s: local version (%s) is newer than repo version (%s)\n",
+				fprintf(stderr, ":: %s: local version (%s) appears to be newer than repo version (%s)\n",
 					local->name, local->version, sync->pkg->version);
 				newer = 1;
 				FREE(sync);