aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt/pkg-devel
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2020-02-12 14:53:32 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2020-02-12 14:53:32 +0000
commit33acfa449ca7a2d259cb6eeeecaa011ecce530e5 (patch)
tree57467fe396c6b928c5e19ae20537c36419e352c8 /ports-mgmt/pkg-devel
parentc092e4c314fd6e203e53471ef36bb1e1fd5a7b48 (diff)
downloadports-33acfa449ca7a2d259cb6eeeecaa011ecce530e5.tar.gz
ports-33acfa449ca7a2d259cb6eeeecaa011ecce530e5.zip
Update to 1.13.99.0
- Fix inverted logic about rcscripts - Improve the build handling of dependency
Notes
Notes: svn path=/head/; revision=525914
Diffstat (limited to 'ports-mgmt/pkg-devel')
-rw-r--r--ports-mgmt/pkg-devel/Makefile5
-rw-r--r--ports-mgmt/pkg-devel/distinfo6
-rw-r--r--ports-mgmt/pkg-devel/files/patch-libfetch31
3 files changed, 5 insertions, 37 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 3002fb366393..33fd1cd4a171 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,9 +1,8 @@
# $FreeBSD$
PORTNAME= pkg
-DISTVERSION= 1.12.99.4
+DISTVERSION= 1.13.99.0
_PKG_VERSION= ${DISTVERSION}
-PORTREVISION= 1
CATEGORIES= ports-mgmt
PKGNAMESUFFIX= -devel
@@ -14,7 +13,7 @@ LICENSE= BSD2CLAUSE
USE_GITHUB= yes
GH_ACCOUNT= freebsd
-GH_TAGNAME= 72fa511f
+GH_TAGNAME= ec7dd7e0
WITH_DEBUG= yes
CFLAGS+= -O0 -g -Wno-error
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index f9aea70daae0..f604de67f5d7 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580298354
-SHA256 (freebsd-pkg-1.12.99.4-72fa511f_GH0.tar.gz) = 2ea854b878412e44da89aff71fb1617848826ebd09bcd529757c5300ddd47816
-SIZE (freebsd-pkg-1.12.99.4-72fa511f_GH0.tar.gz) = 3386496
+TIMESTAMP = 1581519100
+SHA256 (freebsd-pkg-1.13.99.0-ec7dd7e0_GH0.tar.gz) = 8cc835475644fb4d47bbec03159b5d31dbc6f75210c647ea88f3550d1ccca92e
+SIZE (freebsd-pkg-1.13.99.0-ec7dd7e0_GH0.tar.gz) = 3387030
diff --git a/ports-mgmt/pkg-devel/files/patch-libfetch b/ports-mgmt/pkg-devel/files/patch-libfetch
deleted file mode 100644
index 162a61b1a469..000000000000
--- a/ports-mgmt/pkg-devel/files/patch-libfetch
+++ /dev/null
@@ -1,31 +0,0 @@
-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;