diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-03-26 21:25:47 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-03-26 21:25:47 +0000 |
| commit | 6b22736a0e7b6e2a0e18dcfa79309a1b4a894f34 (patch) | |
| tree | e4f3e4accd8e37900c3a7ce1f3816c535620934c | |
| parent | Update to 0.15.0 (diff) | |
Update to 1.10.1
- Cache pw result to avoid over reloading nssswitch.conf
- Fix allow to set env per repo for everykind of repo
- Fix signing_command something saving a truncated signature in the file
as a result pkg will reject any repository signed
- Fix sqlite vfs overload with new sqlite
- pkg which: add -m to show what files matched using globs
- Revert the new UI which does not respect 80 columns
- Fix query '%q' printing the internal arch instead of the official one
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/pkg/distinfo | 6 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-repo-env | 14 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-signing_command | 20 |
4 files changed, 4 insertions, 39 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 7f7302f7c902..dc8d63c44fd3 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.10.0 -PORTREVISION= 2 +DISTVERSION= 1.10.1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index 3ba8771beec8..f87080ed50de 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487976687 -SHA256 (pkg-1.10.0.tar.xz) = d561288a4c3fbde7cede45f040b276f89e984c288c91c07559d48e3b984b7748 -SIZE (pkg-1.10.0.tar.xz) = 2207908 +TIMESTAMP = 1490563192 +SHA256 (pkg-1.10.1.tar.xz) = 6cf178ce356588cddcba60a2c53ef18f5aac2c87628e3d3924a54743573aee4d +SIZE (pkg-1.10.1.tar.xz) = 2169816 diff --git a/ports-mgmt/pkg/files/patch-repo-env b/ports-mgmt/pkg/files/patch-repo-env deleted file mode 100644 index 9e00945dfcb1..000000000000 --- a/ports-mgmt/pkg/files/patch-repo-env +++ /dev/null @@ -1,14 +0,0 @@ -diff --git libpkg/fetch.c libpkg/fetch.c -index 035842b7..fd520ed5 100644 ---- libpkg/fetch.c -+++ libpkg/fetch.c -@@ -515,7 +515,9 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest, - - url += strlen(URL_SCHEME_PREFIX); - pkg_url_scheme = true; -+ } - -+ if (repo != NULL) { - LL_FOREACH(repo->env, kv) { - kvtmp = xcalloc(1, sizeof(*kvtmp)); - kvtmp->key = xstrdup(kv->key); diff --git a/ports-mgmt/pkg/files/patch-signing_command b/ports-mgmt/pkg/files/patch-signing_command deleted file mode 100644 index d5a15fc48521..000000000000 --- a/ports-mgmt/pkg/files/patch-signing_command +++ /dev/null @@ -1,20 +0,0 @@ -commit df567e873326532a96de420e6953d7111f446cff -Author: Baptiste Daroussin <bapt@FreeBSD.org> -Date: Mon Feb 27 14:31:48 2017 +0100 - - Use binary copy instead of printf to fix issues with pkg repo - signing_command when the signature contains \0 - -diff --git libpkg/pkg_repo_create.c libpkg/pkg_repo_create.c -index ac69e06c..1dab735c 100644 ---- libpkg/pkg_repo_create.c -+++ libpkg/pkg_repo_create.c -@@ -822,7 +822,7 @@ pkg_repo_sign(char *path, char **argv, int argc, UT_string **sig, UT_string **ce - break; - } - if (buf != NULL) -- utstring_printf(buf, "%s", line); -+ utstring_bincpy(buf, line, linelen); - } - - if (pclose(fp) != 0) { |