Imported from pacman-2.6.3.tar.gz

ChangeLog

@@ -1,5 +1,6 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+2.6.3         - A couple memory fixes in the new replaces code
 2.6.2         - Fixed a memory cleanup bug
               - Aurelien's patch:
                 - bug #159 implemented (for -S and -R)

Makefile.in

@@ -34,7 +34,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-PACVER = 2.6.2
+PACVER = 2.6.3
 
 TOPDIR = @srcdir@
 SRCDIR = $(TOPDIR)/src/

scripts/gensync

@@ -20,7 +20,7 @@
 #   USA.
 #
 
-myver='2.6.2'
+myver='2.6.3'
 
 usage() {
   echo "gensync $myver"

scripts/makepkg

@@ -20,7 +20,7 @@
 #   USA.
 #
 
-myver='2.6.2'
+myver='2.6.3'
 startdir=`pwd`
 
 # source Arch's abs.conf if it's present

scripts/makeworld

@@ -21,7 +21,7 @@
 #
 
 toplevel=`pwd`
-version="2.6.2"
+version="2.6.3"
 
 usage() {
 	echo "makeworld version $version"

src/pacman.c

@@ -972,7 +972,7 @@ int pacman_sync(pacdb_t *db, PMList *targets)
 									db_write(db, depender);
 									
 									/* add the new requiredby */
-									new->requiredby = list_add(new->requiredby, k->data);
+									new->requiredby = list_add(new->requiredby, strdup(k->data));
 								}
 							}
 						}
@@ -1013,9 +1013,7 @@ int pacman_sync(pacdb_t *db, PMList *targets)
 		db_close(dbs->db);
 		for(j = dbs->pkgcache; j; j = j->next) {
 			if(j->data) {
-				/* XXX: this freepkg() still locks up, but only when the "replaces"
+				freepkg(j->data);
-				 *      code has been run
-				freepkg(j->data);*/
 				j->data = NULL;
 			}
 		}

src/pacman.h

@@ -22,7 +22,7 @@
 #define _PAC_PACMAN_H
 
 #ifndef PACVER
-#define PACVER    "2.6.2"
+#define PACVER    "2.6.3"
 #endif
 
 #ifndef PKGDIR