Merge branch 'maint'

Makefile.am

@@ -23,8 +23,8 @@ dist_pkgdata_DATA = \
 	proto/PKGBUILD-vcs.proto \
 	proto/proto.install
 
-$(top_srcdir)/test/pacman/tests/TESTS: $(wildcard test/pacman/tests/*.py*)
+$(top_srcdir)/test/pacman/tests/TESTS: $(wildcard test/pacman/tests/*.py)
-	@printf "TESTS += %s\n" $^ | sed -e "s/\.py\.in/.py/" | LC_ALL=C sort -u > "$@"
+	@printf "TESTS += %s\n" $^ | LC_ALL=C sort -u > "$@"
 
 TESTS =  test/scripts/parseopts_test.sh \
 				 test/scripts/human_to_size_test.sh \

lib/libalpm/add.c

@@ -227,8 +227,10 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
 	if(llstat(filename, &lsbuf) != 0) {
 		/* cases 1,2: file doesn't exist, skip all backup checks */
 	} else if(S_ISDIR(lsbuf.st_mode) && S_ISDIR(entrymode)) {
+#if 0
 		uid_t entryuid = archive_entry_uid(entry);
 		gid_t entrygid = archive_entry_gid(entry);
+#endif
 
 		/* case 6: existing dir, ignore it */
 		if(lsbuf.st_mode != entrymode) {
@@ -243,6 +245,11 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
 					entrymode & mask);
 		}
 
+#if 0
+		/* Disable this warning until our user management in packages has improved.
+		   Currently many packages have to create users in post_install and chown the
+		   directories. These all resulted in "false-positive" warnings. */
+
 		if((entryuid != lsbuf.st_uid) || (entrygid != lsbuf.st_gid)) {
 			_alpm_log(handle, ALPM_LOG_WARNING, _("directory ownership differs on %s\n"
 					"filesystem: %u:%u  package: %u:%u\n"), filename,
@@ -252,6 +259,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
 					"filesystem: %u:%u  package: %u:%u\n", filename,
 					lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid);
 		}
+#endif
 
 		_alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n",
 				filename);

lib/libalpm/db.c

@@ -579,6 +579,13 @@ int _alpm_db_add_pkgincache(alpm_db_t *db, alpm_pkg_t *pkg)
 
 	_alpm_log(db->handle, ALPM_LOG_DEBUG, "adding entry '%s' in '%s' cache\n",
 						newpkg->name, db->treename);
+	if(newpkg->origin == ALPM_PKG_FROM_FILE) {
+		free(newpkg->origin_data.file);
+	}
+	newpkg->origin = (db->status & DB_STATUS_LOCAL)
+		? ALPM_PKG_FROM_LOCALDB
+		: ALPM_PKG_FROM_SYNCDB;
+	newpkg->origin_data.db = db;
 	db->pkgcache = _alpm_pkghash_add_sorted(db->pkgcache, newpkg);
 
 	free_groupcache(db);

test/pacman/tests/.gitignore

@@ -1 +0,0 @@
-sync200.py

test/pacman/tests/Makefile.am

@@ -1,25 +1,7 @@
-CONFTESTS = $(patsubst %py.in,%py,$(wildcard *.py.in))
+check_SCRIPTS = $(wildcard *.py)
-
-check_SCRIPTS =	\
-	$(wildcard *.py) \
-	$(CONFTESTS)
 
 noinst_SCRIPTS = $(check_SCRIPTS)
 
 EXTRA_DIST = $(check_SCRIPTS)
 
-CLEANFILES = $(CONFTESTS)
-
-#### Taken from the autoconf scripts Makefile.am ####
-edit = sed \
-  -e 's|@LIBCURL[@]|$(LIBCURL)|g' \
-  -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g'
-
-
-$(CONFTESTS): Makefile
-	$(AM_V_at)$(RM) $@ $@.tmp
-	$(AM_V_GEN)test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true
-	$(AM_V_at)chmod a-w $@.tmp
-	$(AM_V_at)mv $@.tmp $@
-
 # vim:set noet:

test/pacman/tests/sync200.py

@@ -1,6 +1,5 @@
 self.description = "Synchronize the local database"
 
-if len("@LIBCURL@") == 0:
 self.option['XferCommand'] = ['/usr/bin/curl %u > %o']
 
 sp1 = pmpkg("spkg1", "1.0-1")

valgrind.supp

@@ -164,6 +164,6 @@
    obj:/usr/lib/libfakeroot/fakechroot/libfakechroot.so
    fun:call_init.part.0
    fun:_dl_init
-   obj:/usr/lib/ld-2.20.so
+   obj:/usr/lib/ld-*.so
    ...
 }