aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2013-06-29 06:26:28 +0800
committerbdrewery <bdrewery@FreeBSD.org>2013-06-29 06:26:28 +0800
commitf5aad63e4779e5112f00c600169bd1aa868bc51e (patch)
tree14163c34b7443971979678ae37fbe9f3d482dae0 /ports-mgmt
parentac38eed3b7dec76e2dd927cab5650b91ff69393a (diff)
downloadfreebsd-ports-gnome-f5aad63e4779e5112f00c600169bd1aa868bc51e.tar.gz
freebsd-ports-gnome-f5aad63e4779e5112f00c600169bd1aa868bc51e.tar.zst
freebsd-ports-gnome-f5aad63e4779e5112f00c600169bd1aa868bc51e.zip
- Update to 1.1.3
Changes: - Fix repository signing verification with new format during update - Disable terminal title setting - Fix %a/%k returning true/false instead of 0/1 - Various memory/fd leaks have been fixed - Fixed pkg self-upgrade detection - ZSH completion fixes - Several crashes fixed With hat: portmgr
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/pkg-devel/Makefile2
-rw-r--r--ports-mgmt/pkg-devel/distinfo4
-rw-r--r--ports-mgmt/pkg/Makefile3
-rw-r--r--ports-mgmt/pkg/distinfo4
-rw-r--r--ports-mgmt/pkg/files/patch-pkg__query.c42
5 files changed, 6 insertions, 49 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 1a783fcc02b8..4a98ebf4dc9a 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pkg
-DISTVERSION= 1.1.2
+DISTVERSION= 1.1.3
CATEGORIES= ports-mgmt
MASTER_SITES= http://files.etoilebsd.net/pkg/ \
http://mirror.shatow.net/freebsd/${PORTNAME}/ \
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index c802822c4f8e..da90e3a56785 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.1.2.tar.xz) = 1f5c8bd5c0fae93a53d87c68a0965ead1e7d7433d71aa5b158dd82ffafaafcf9
-SIZE (pkg-1.1.2.tar.xz) = 1554568
+SHA256 (pkg-1.1.3.tar.xz) = 65753ab85d544557436b65d5f89c642855765638a2a51922cbadbff18ae04f20
+SIZE (pkg-1.1.3.tar.xz) = 1554900
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index 8ad7a327a47f..0d431dd15f85 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pkg
-DISTVERSION= 1.1.2
-PORTREVISION= 1
+DISTVERSION= 1.1.3
CATEGORIES= ports-mgmt
MASTER_SITES= http://files.etoilebsd.net/pkg/ \
http://mirror.shatow.net/freebsd/${PORTNAME}/ \
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index c802822c4f8e..da90e3a56785 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.1.2.tar.xz) = 1f5c8bd5c0fae93a53d87c68a0965ead1e7d7433d71aa5b158dd82ffafaafcf9
-SIZE (pkg-1.1.2.tar.xz) = 1554568
+SHA256 (pkg-1.1.3.tar.xz) = 65753ab85d544557436b65d5f89c642855765638a2a51922cbadbff18ae04f20
+SIZE (pkg-1.1.3.tar.xz) = 1554900
diff --git a/ports-mgmt/pkg/files/patch-pkg__query.c b/ports-mgmt/pkg/files/patch-pkg__query.c
deleted file mode 100644
index f0639c6094d4..000000000000
--- a/ports-mgmt/pkg/files/patch-pkg__query.c
+++ /dev/null
@@ -1,42 +0,0 @@
-From f127fb779a1a405446804235fce223cc8abc44ea Mon Sep 17 00:00:00 2001
-From: Bryan Drewery <bryan@shatow.net>
-Date: Wed, 26 Jun 2013 06:48:17 -0500
-Subject: [PATCH] Revert pkg-query %a and %k back to an integer
-
-Scripts such as portmaster and portupgrade expect an integer
-here. This is also the advertised result in the manpage.
----
- pkg/query.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/pkg/query.c b/pkg/query.c
-index bdca068..5cb00e0 100644
---- pkg/query.c
-+++ pkg/query.c
-@@ -77,6 +77,8 @@
- static void
- format_str(struct pkg *pkg, struct sbuf *dest, const char *qstr, void *data)
- {
-+ bool automatic;
-+ bool locked;
-
- sbuf_clear(dest);
-
-@@ -109,10 +111,12 @@
- pkg_sbuf_printf(dest, "%w", pkg);
- break;
- case 'a':
-- pkg_sbuf_printf(dest, "%a", pkg);
-+ pkg_get(pkg, PKG_AUTOMATIC, &automatic);
-+ sbuf_printf(dest, "%d", automatic);
- break;
- case 'k':
-- pkg_sbuf_printf(dest, "%k", pkg);
-+ pkg_get(pkg, PKG_LOCKED, &locked);
-+ sbuf_printf(dest, "%d", locked);
- break;
- case 't':
- pkg_sbuf_printf(dest, "%t", pkg);
---
-1.8.1.6
-