From owner-svn-ports-all@freebsd.org Thu Jul 9 14:01:08 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A521A36C413; Thu, 9 Jul 2020 14:01:08 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B2dBD3yFnz456g; Thu, 9 Jul 2020 14:01:08 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6BF18122B8; Thu, 9 Jul 2020 14:01:08 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 069E18kO082410; Thu, 9 Jul 2020 14:01:08 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 069E17nW082407; Thu, 9 Jul 2020 14:01:07 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <202007091401.069E17nW082407@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Thu, 9 Jul 2020 14:01:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r541751 - in branches/2020Q3/devel/popt: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jpaetzel X-SVN-Commit-Paths: in branches/2020Q3/devel/popt: . files X-SVN-Commit-Revision: 541751 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jul 2020 14:01:08 -0000 Author: jpaetzel Date: Thu Jul 9 14:01:07 2020 New Revision: 541751 URL: https://svnweb.freebsd.org/changeset/ports/541751 Log: MFH: r541348 Fix some regressions in the 1.18 reboot of development. PR: 247529 Submitted by: vvd@unislabs.com daniel.engberg.lists@pyret.net Reported by: tobik Approved by: ports-secteam (joneum) Added: branches/2020Q3/devel/popt/files/patch-src_popt.c - copied unchanged from r541348, head/devel/popt/files/patch-src_popt.c branches/2020Q3/devel/popt/files/patch-src_poptint.h - copied unchanged from r541348, head/devel/popt/files/patch-src_poptint.h Modified: branches/2020Q3/devel/popt/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/devel/popt/Makefile ============================================================================== --- branches/2020Q3/devel/popt/Makefile Thu Jul 9 13:46:15 2020 (r541750) +++ branches/2020Q3/devel/popt/Makefile Thu Jul 9 14:01:07 2020 (r541751) @@ -3,6 +3,7 @@ PORTNAME= popt PORTVERSION= 1.18 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://ftp.rpm.org/popt/releases/popt-1.x/ @@ -23,7 +24,7 @@ INSTALL_TARGET= install-strip USE_LDCONFIG= yes NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext +NLS_USES= gettext-runtime localbase OPTIONS_SUB= yes .include Copied: branches/2020Q3/devel/popt/files/patch-src_popt.c (from r541348, head/devel/popt/files/patch-src_popt.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/devel/popt/files/patch-src_popt.c Thu Jul 9 14:01:07 2020 (r541751, copy of r541348, head/devel/popt/files/patch-src_popt.c) @@ -0,0 +1,55 @@ +--- src/popt.c.orig 2020-05-18 07:43:13 UTC ++++ src/popt.c +@@ -168,6 +168,7 @@ poptContext poptGetContext(const char * name, int argc + con->os->next = 1; /* skip argv[0] */ + + con->leftovers = calloc( (size_t)(argc + 1), sizeof(*con->leftovers) ); ++ con->allocLeftovers = argc + 1; + con->options = options; + con->aliases = NULL; + con->numAliases = 0; +@@ -1269,8 +1270,21 @@ int poptGetNextOpt(poptContext con) + con->os->nextArg = xstrdup(origOptString); + return 0; + } +- if (con->leftovers != NULL) /* XXX can't happen */ +- con->leftovers[con->numLeftovers++] = origOptString; ++ if (con->leftovers != NULL) { /* XXX can't happen */ ++ /* One might think we can never overflow the leftovers ++ array. Actually, that's true, as long as you don't ++ use poptStuffArgs()... */ ++ if ((con->numLeftovers + 1) >= (con->allocLeftovers)) { ++ con->allocLeftovers += 10; ++ con->leftovers = ++ realloc(con->leftovers, ++ sizeof(*con->leftovers) * con->allocLeftovers); ++ } ++ con->leftovers[con->numLeftovers++] ++ = xstrdup(origOptString); /* so a free of a stuffed ++ argv doesn't give us a ++ dangling pointer */ ++ } + continue; + } + +@@ -1519,6 +1533,8 @@ poptItem poptFreeItems(poptItem items, int nitems) + + poptContext poptFreeContext(poptContext con) + { ++ int i; ++ + if (con == NULL) return con; + poptResetContext(con); + +@@ -1528,7 +1544,11 @@ poptContext poptFreeContext(poptContext con) + con->execs = poptFreeItems(con->execs, con->numExecs); + con->numExecs = 0; + ++ for (i = 0; i < con->numLeftovers; i++) { ++ con->leftovers[i] = _free(&con->leftovers[i]); ++ } + con->leftovers = _free(con->leftovers); ++ + con->finalArgv = _free(con->finalArgv); + con->appName = _free(con->appName); + con->otherHelp = _free(con->otherHelp); Copied: branches/2020Q3/devel/popt/files/patch-src_poptint.h (from r541348, head/devel/popt/files/patch-src_poptint.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/devel/popt/files/patch-src_poptint.h Thu Jul 9 14:01:07 2020 (r541751, copy of r541348, head/devel/popt/files/patch-src_poptint.h) @@ -0,0 +1,10 @@ +--- src/poptint.h.orig 2020-05-18 07:43:13 UTC ++++ src/poptint.h +@@ -94,6 +94,7 @@ struct poptContext_s { + struct optionStackEntry * os; + poptArgv leftovers; + int numLeftovers; ++ int allocLeftovers; + int nextLeftover; + const struct poptOption * options; + int restLeftover;