From owner-svn-ports-all@freebsd.org Wed Jan 29 13:10:15 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 532BD1D7FB6; Wed, 29 Jan 2020 13:10:15 +0000 (UTC) (envelope-from bapt@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) server-signature RSA-PSS (4096 bits) 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 4873kH1TRCz4ZGX; Wed, 29 Jan 2020 13:10:15 +0000 (UTC) (envelope-from bapt@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 2DE10C835; Wed, 29 Jan 2020 13:10:15 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00TDAFZn091210; Wed, 29 Jan 2020 13:10:15 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00TDAEmh091209; Wed, 29 Jan 2020 13:10:14 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202001291310.00TDAEmh091209@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 29 Jan 2020 13:10:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r524544 - in branches/2020Q1/ports-mgmt/pkg: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in branches/2020Q1/ports-mgmt/pkg: . files X-SVN-Commit-Revision: 524544 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.29 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: Wed, 29 Jan 2020 13:10:15 -0000 Author: bapt Date: Wed Jan 29 13:10:14 2020 New Revision: 524544 URL: https://svnweb.freebsd.org/changeset/ports/524544 Log: MFH: r524543 Import the libfetch patch to the bundled libfetch Approved by: portmgr (implicit) Added: branches/2020Q1/ports-mgmt/pkg/files/patch-libfetch - copied unchanged from r524543, head/ports-mgmt/pkg/files/patch-libfetch Modified: branches/2020Q1/ports-mgmt/pkg/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/ports-mgmt/pkg/Makefile ============================================================================== --- branches/2020Q1/ports-mgmt/pkg/Makefile Wed Jan 29 13:09:01 2020 (r524543) +++ branches/2020Q1/ports-mgmt/pkg/Makefile Wed Jan 29 13:10:14 2020 (r524544) @@ -3,6 +3,7 @@ PORTNAME= pkg DISTVERSION= 1.12.0 _PKG_VERSION= ${DISTVERSION} +PORTREVISION= 1 CATEGORIES= ports-mgmt #MASTER_SITES= \ # http://files.etoilebsd.net/${PORTNAME}/ \ Copied: branches/2020Q1/ports-mgmt/pkg/files/patch-libfetch (from r524543, head/ports-mgmt/pkg/files/patch-libfetch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/ports-mgmt/pkg/files/patch-libfetch Wed Jan 29 13:10:14 2020 (r524544, copy of r524543, head/ports-mgmt/pkg/files/patch-libfetch) @@ -0,0 +1,31 @@ +diff --git a/external/libfetch/fetch.c b/external/libfetch/fetch.c +index 47c03a79..df5d5547 100644 +--- external/libfetch/fetch.c ++++ external/libfetch/fetch.c +@@ -332,6 +332,8 @@ fetch_pctdecode(char *dst, const char *src, size_t dlen) + } + if (dlen-- > 0) + *dst++ = c; ++ else ++ return (NULL); + } + return (s); + } +@@ -381,11 +383,15 @@ fetchParseURL(const char *URL) + if (p && *p == '@') { + /* username */ + q = fetch_pctdecode(u->user, URL, URL_USERLEN); ++ if (q == NULL) ++ goto ouch; + + /* password */ +- if (*q == ':') ++ if (*q == ':') { + q = fetch_pctdecode(u->pwd, q + 1, URL_PWDLEN); +- ++ if (q == NULL) ++ goto ouch; ++ } + p++; + } else { + p = URL;