From 24b934e8868e1162c44ee06b2cb2990b6a434a98 Mon Sep 17 00:00:00 2001
From: Judd Vinet <judd@archlinux.org>
Date: Wed, 1 Oct 2003 23:14:37 +0000
Subject: Imported from pacman-2.6.3.tar.gz

---
 ChangeLog         | 1 +
 Makefile.in       | 2 +-
 scripts/gensync   | 2 +-
 scripts/makepkg   | 2 +-
 scripts/makeworld | 2 +-
 src/pacman.c      | 6 ++----
 src/pacman.h      | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b646c84..732bad08 100644
--- a/ChangeLog
+++ b/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)
diff --git a/Makefile.in b/Makefile.in
index de0462ab..60d1bdeb 100644
--- a/Makefile.in
+++ b/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/
diff --git a/scripts/gensync b/scripts/gensync
index ad12d16c..1839655d 100755
--- a/scripts/gensync
+++ b/scripts/gensync
@@ -20,7 +20,7 @@
 #   USA.
 #
 
-myver='2.6.2'
+myver='2.6.3'
 
 usage() {
   echo "gensync $myver"
diff --git a/scripts/makepkg b/scripts/makepkg
index 9fa75865..5ca04a1a 100755
--- a/scripts/makepkg
+++ b/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
diff --git a/scripts/makeworld b/scripts/makeworld
index 1c61ed17..16d79923 100755
--- a/scripts/makeworld
+++ b/scripts/makeworld
@@ -21,7 +21,7 @@
 #
 
 toplevel=`pwd`
-version="2.6.2"
+version="2.6.3"
 
 usage() {
 	echo "makeworld version $version"
diff --git a/src/pacman.c b/src/pacman.c
index 92476fe6..8aa7037a 100644
--- a/src/pacman.c
+++ b/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"
-				 *      code has been run
-				freepkg(j->data);*/
+				freepkg(j->data);
 				j->data = NULL;
 			}
 		}
diff --git a/src/pacman.h b/src/pacman.h
index c4810d39..cd231dc1 100644
--- a/src/pacman.h
+++ b/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
-- 
cgit v1.2.3-24-g4f1b