Date: Mon, 16 Dec 2013 14:30:11 -0600 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Baptiste Daroussin <bapt@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, owner-ports-committers@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r336622 - in head/ports-mgmt: pkg pkg-devel pkg-devel/files pkg/files Message-ID: <7c20a85089a619a0422141bdca3b0be2@shatow.net> In-Reply-To: <201312161116.rBGBGfcC000560@svn.freebsd.org> References: <201312161116.rBGBGfcC000560@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7c20a85089a619a0422141bdca3b0be2>