diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2020-01-29 13:11:09 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2020-01-29 13:11:09 +0000 |
| commit | 52a9e7116c4b275975acdd2deb89a26836dd3770 (patch) | |
| tree | e8eef746444313c07f418a1ef325074dbe66a001 /ports-mgmt | |
| parent | d6f58b53513f647cc986dd027f6a0f23ac8ba152 (diff) | |
| download | ports-52a9e7116c4b275975acdd2deb89a26836dd3770.tar.gz ports-52a9e7116c4b275975acdd2deb89a26836dd3770.zip | |
Import the libfetch patch to the bundled libfetch
Notes
Notes:
svn path=/head/; revision=524545
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/pkg-devel/files/patch-libfetch | 31 |
2 files changed, 32 insertions, 0 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 8096b28411b1..3002fb366393 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= pkg DISTVERSION= 1.12.99.4 _PKG_VERSION= ${DISTVERSION} +PORTREVISION= 1 CATEGORIES= ports-mgmt PKGNAMESUFFIX= -devel diff --git a/ports-mgmt/pkg-devel/files/patch-libfetch b/ports-mgmt/pkg-devel/files/patch-libfetch new file mode 100644 index 000000000000..162a61b1a469 --- /dev/null +++ b/ports-mgmt/pkg-devel/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; |