svn commit: r336632 - in branches/2014Q1/ports-mgmt: pkg pkg-devel pkg-devel/files pkg/files

[Baptiste Daroussin]

Author: bapt
Date: Mon Dec 16 12:59:04 2013
New Revision: 336632
URL: http://svnweb.freebsd.org/changeset/ports/336632

Log:
  MFH: r336622
  
  Fix sefault while cleaning up
  It only happens if one has list or key/value list in pkg.conf
  a workaround to update is to comment it out the time to upgrade
  
  Reported by:	many
  Pointyhat to:	bapt (again)

Added:
  branches/2014Q1/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config
     - copied unchanged from r336622, head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config
  branches/2014Q1/ports-mgmt/pkg/files/patch-libpkg_pkg_config
     - copied unchanged from r336622, head/ports-mgmt/pkg/files/patch-libpkg_pkg_config
Modified:
  branches/2014Q1/ports-mgmt/pkg-devel/Makefile
  branches/2014Q1/ports-mgmt/pkg/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/ports-mgmt/pkg-devel/Makefile
==============================================================================
--- branches/2014Q1/ports-mgmt/pkg-devel/Makefile	Mon Dec 16 12:52:18 2013	(r336631)
+++ branches/2014Q1/ports-mgmt/pkg-devel/Makefile	Mon Dec 16 12:59:04 2013	(r336632)
@@ -2,6 +2,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://files.etoilebsd.net/pkg/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \

Copied: branches/2014Q1/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config (from r336622, head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config	Mon Dec 16 12:59:04 2013	(r336632, copy of r336622, head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config)
@@ -0,0 +1,28 @@
+--- libpkg/pkg_config.c.orig	2013-12-16 08:52:39.000000000 +0100
++++ libpkg/pkg_config.c	2013-12-16 12:09:13.093549000 +0100
+@@ -293,6 +293,7 @@
+ static size_t c_size = sizeof(c) / sizeof(struct config_entry);
+ 
+ static void		 pkg_config_kv_free(struct pkg_config_kv *);
++static void		 pkg_config_value_free(struct pkg_config_value *);
+ static void pkg_config_free(struct pkg_config *conf);
+ static struct pkg_repo	*pkg_repo_new(const char *name, const char *url);
+ 
+@@ -440,7 +441,7 @@
+ 					continue;
+ 				}
+ 				if (!conf->fromenv) {
+-					pkg_config_free(conf);
++					HASH_FREE(conf->list, pkg_config_value, pkg_config_value_free);
+ 					conf->list = NULL;
+ 					obj_walk_array(cur, conf);
+ 				}
+@@ -452,7 +453,7 @@
+ 					continue;
+ 				}
+ 				if (!conf->fromenv) {
+-					pkg_config_free(conf);
++					HASH_FREE(conf->kvlist, pkg_config_kv, pkg_config_kv_free);
+ 					conf->kvlist = NULL;
+ 					obj_walk_object(cur, conf);
+ 				}

Modified: branches/2014Q1/ports-mgmt/pkg/Makefile
==============================================================================
--- branches/2014Q1/ports-mgmt/pkg/Makefile	Mon Dec 16 12:52:18 2013	(r336631)
+++ branches/2014Q1/ports-mgmt/pkg/Makefile	Mon Dec 16 12:59:04 2013	(r336632)
@@ -2,6 +2,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://files.etoilebsd.net/pkg/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \

Copied: branches/2014Q1/ports-mgmt/pkg/files/patch-libpkg_pkg_config (from r336622, head/ports-mgmt/pkg/files/patch-libpkg_pkg_config)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/ports-mgmt/pkg/files/patch-libpkg_pkg_config	Mon Dec 16 12:59:04 2013	(r336632, copy of r336622, head/ports-mgmt/pkg/files/patch-libpkg_pkg_config)
@@ -0,0 +1,28 @@
+--- libpkg/pkg_config.c.orig	2013-12-16 08:52:39.000000000 +0100
++++ libpkg/pkg_config.c	2013-12-16 12:09:13.093549000 +0100
+@@ -293,6 +293,7 @@
+ static size_t c_size = sizeof(c) / sizeof(struct config_entry);
+ 
+ static void		 pkg_config_kv_free(struct pkg_config_kv *);
++static void		 pkg_config_value_free(struct pkg_config_value *);
+ static void pkg_config_free(struct pkg_config *conf);
+ static struct pkg_repo	*pkg_repo_new(const char *name, const char *url);
+ 
+@@ -440,7 +441,7 @@
+ 					continue;
+ 				}
+ 				if (!conf->fromenv) {
+-					pkg_config_free(conf);
++					HASH_FREE(conf->list, pkg_config_value, pkg_config_value_free);
+ 					conf->list = NULL;
+ 					obj_walk_array(cur, conf);
+ 				}
+@@ -452,7 +453,7 @@
+ 					continue;
+ 				}
+ 				if (!conf->fromenv) {
+-					pkg_config_free(conf);
++					HASH_FREE(conf->kvlist, pkg_config_kv, pkg_config_kv_free);
+ 					conf->kvlist = NULL;
+ 					obj_walk_object(cur, conf);
+ 				}