From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 20:30:14 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 236B1B0B for ; Mon, 16 Dec 2013 20:30:14 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 042E51921 for ; Mon, 16 Dec 2013 20:30:14 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGKUD0b050928 for ; Mon, 16 Dec 2013 20:30:13 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBGKUD76050923 for svn-ports-head@freebsd.org; Mon, 16 Dec 2013 20:30:13 GMT (envelope-from bdrewery) Received: (qmail 33176 invoked from network); 16 Dec 2013 14:30:11 -0600 Received: from unknown (HELO roundcube.xk42.net) (10.10.5.5) by sweb.xzibition.com with SMTP; 16 Dec 2013 14:30:11 -0600 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 16 Dec 2013 14:30:11 -0600 From: Bryan Drewery To: Baptiste Daroussin Subject: Re: svn commit: r336622 - in head/ports-mgmt: pkg pkg-devel pkg-devel/files pkg/files Organization: FreeBSD In-Reply-To: <201312161116.rBGBGfcC000560@svn.freebsd.org> References: <201312161116.rBGBGfcC000560@svn.freebsd.org> Message-ID: <7c20a85089a619a0422141bdca3b0be2@shatow.net> X-Sender: bdrewery@FreeBSD.org User-Agent: Roundcube Webmail/0.9.5 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, owner-ports-committers@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 20:30:14 -0000 This one is my fault! On 2013-12-16 05:16, Baptiste Daroussin wrote: > Author: bapt > Date: Mon Dec 16 11:16:41 2013 > New Revision: 336622 > URL: http://svnweb.freebsd.org/changeset/ports/336622 > > Log: > 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: > head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config (contents, > props changed) > head/ports-mgmt/pkg/files/patch-libpkg_pkg_config (contents, props > changed) > Modified: > head/ports-mgmt/pkg-devel/Makefile > head/ports-mgmt/pkg/Makefile > > Modified: head/ports-mgmt/pkg-devel/Makefile > ============================================================================== > --- head/ports-mgmt/pkg-devel/Makefile Mon Dec 16 11:11:09 > 2013 (r336621) > +++ head/ports-mgmt/pkg-devel/Makefile Mon Dec 16 11:16:41 > 2013 (r336622) > @@ -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}/ \ > > Added: head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config Mon Dec 16 > 11:16:41 2013 (r336622) > @@ -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: head/ports-mgmt/pkg/Makefile > ============================================================================== > --- head/ports-mgmt/pkg/Makefile Mon Dec 16 11:11:09 2013 (r336621) > +++ head/ports-mgmt/pkg/Makefile Mon Dec 16 11:16:41 2013 (r336622) > @@ -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}/ \ > > Added: head/ports-mgmt/pkg/files/patch-libpkg_pkg_config > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/ports-mgmt/pkg/files/patch-libpkg_pkg_config Mon Dec 16 > 11:16:41 2013 (r336622) > @@ -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); > + } -- Regards, Bryan Drewery