Release pkg 1.13

 - when installing over a non tracked file (not owned by any package)
   pkg now saves a copy of that file as .pkgsave
 - Fix a chicken/egg problem with the meta being compressed and defining
   the compression format. Now pkg repo will create a meta.conf file
   uncompressed (it is small enough) and fallback on the old meta.txz.
   Note that meta.txz is still created for backward compatibility.
 - pkg repo now creates meta files in version 2 by default meaning the
   digests.txz (this was only used with pkg up to 1.2).
   Anyone using that version and willing to upgrade can do it via:
   pkg bootstrap -f
 - suppress version checking when -j is specified
 - Alphabetically sort packages printed in the output of pkg commands to
   ease readability
 - pkg lock/unlock now allows multiple packages in arguments
 - shell script can now print messages along with pkg-messages by writing
   to ${PKG_MSGFD} file descriptor
 - improve error reporting when parsing vuxml files
 - lua script are now ready for prime time:
   - sanboxed with capsicum on plateforms that support it
   - rootdir native
   - documented
 - Fix pkg backup
 - pkg now gives a hint about running pkg update -f in case of "size mismatch"
 - scripts (lua and shell) can now determine if they are in the process of an
   upgrade or an installation via a variable
 - shell scripts are now fully documented
 - keyword files are now documented

PR:		243564
exp-run by:	antoine

4 files changed, 7 insertions, 36 deletions

diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index 802621e0ab5a..160c8d9d302c 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.12.0
+DISTVERSION=	1.13.0
 _PKG_VERSION=	${DISTVERSION}
-PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 #MASTER_SITES=	\
 #		http://files.etoilebsd.net/${PORTNAME}/ \
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index 61d2139a1c82..088c50907e42 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568790737
-SHA256 (freebsd-pkg-1.12.0_GH0.tar.gz) = 53141c4833a9776d916fb31eff346b8877e687d54edaec59b8472b71f62ec165
-SIZE (freebsd-pkg-1.12.0_GH0.tar.gz) = 3867210
+TIMESTAMP = 1581409421
+SHA256 (freebsd-pkg-1.13.0_GH0.tar.gz) = 9c4a8be80d16562d7acfb95906ab8a8f31620f4d03fa0e8e78fce5e5076bef1f
+SIZE (freebsd-pkg-1.13.0_GH0.tar.gz) = 3386839
diff --git a/ports-mgmt/pkg/files/patch-libfetch b/ports-mgmt/pkg/files/patch-libfetch
deleted file mode 100644
index 162a61b1a469..000000000000
--- a/ports-mgmt/pkg/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;
diff --git a/ports-mgmt/pkg/pkg-plist b/ports-mgmt/pkg/pkg-plist
index fc362bb6e5df..16c8337a0bc9 100644
--- a/ports-mgmt/pkg/pkg-plist
+++ b/ports-mgmt/pkg/pkg-plist
@@ -12,7 +12,10 @@ lib/libpkg.so.4
 libdata/pkgconfig/pkg.pc
 man/man3/pkg_printf.3.gz
 man/man3/pkg_repos.3.gz
+man/man5/pkg-keywords.5.gz
+man/man5/pkg-lua-script.5.gz
 man/man5/pkg-repository.5.gz
+man/man5/pkg-script.5.gz
 man/man5/pkg.conf.5.gz
 man/man8/pkg-add.8.gz
 man/man8/pkg-alias.8.gz