- Update to 1.0.10

- Replace tab with space in pkg-descr

Changes:
  - gcc44/gcc48 build fixes
  - pkg-install now returns 0 when requested pkgs already
    installed
  - Fixed pkgconf file handling
  - Hard-coded post-deinstall list has been moved to
    bsd.pkgng.mk as _FORCE_POST_PATTERNS so we can update
    that instead of having a pkgng release every time a new
    one is identified.
  - Add pkg check -n for -d to be scriptable
  - Fix memory corruption if WWW passed directly to manifest
  - COMMENT/Description/WWW are now required to make valid
    packages
  - Store fetched packages as 0644
  - Add events for conflicts
  - Add -F to pkg-install
  - Pipe fixes
  - Misc fixes

5 files changed, 6 insertions, 46 deletions

diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index 9aaddc765b8b..fa5f720edec2 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.0.9
-PORTREVISION=	2
+DISTVERSION=	1.0.10
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/portmgr \
-		http://files.etoilebsd.net/pkg/
+		http://files.etoilebsd.net/pkg/ \
+		http://mirror.shatow.net/freebsd/${PORTNAME}/
 
 MAINTAINER=	portmgr@FreeBSD.org
 COMMENT=	New generation package manager
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index 7ceadae5ab06..0b099c4c77c0 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.0.9.tar.xz) = 33a59b3a16b4e02eb6cc6c0ad9fd62e0646cba531cec77a442a33e0f03d1da8a
-SIZE (pkg-1.0.9.tar.xz) = 1449752
+SHA256 (pkg-1.0.10.tar.xz) = 97574e656c37830c00e1c9d7119ed3a7acfb2e98e9034e978b4f742f16483d1d
+SIZE (pkg-1.0.10.tar.xz) = 1451432
diff --git a/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c b/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c
deleted file mode 100644
index 224b71985487..000000000000
--- a/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git libpkg/pkg_ports.c libpkg/pkg_ports.c
-index 1c46faa..7bb7bff 100644
---- libpkg/pkg_ports.c
-+++ libpkg/pkg_ports.c
-@@ -363,6 +363,7 @@ meta_exec(struct plist *p, char *line, bool unexec)
- 		    strstr(cmd, "mkfontscale") || strstr(cmd, "mkfontdir") ||
- 		    strstr(cmd, "fc-cache") || strstr(cmd, "fonts.dir") ||
- 		    strstr(cmd, "fonts.scale") ||
-+		    strstr(cmd, "gio-querymodules") ||
- 		    strstr(cmd, "gtk-update-icon-cache") ||
- 		    strstr(cmd, "update-desktop-database") ||
- 		    strstr(cmd, "update-mime-database")) {
diff --git a/ports-mgmt/pkg/files/patch-libpkg__pkgdb.c b/ports-mgmt/pkg/files/patch-libpkg__pkgdb.c
deleted file mode 100644
index 293338866b14..000000000000
--- a/ports-mgmt/pkg/files/patch-libpkg__pkgdb.c
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 6bf8c2d025e30e5635e6648f35ff8dcbc7c4709c
-Author: Alexandre Perrin <alexandre.perrin@netoxygen.ch>
-Date:   Tue Mar 5 12:04:44 2013 +0100
-
-    check the return value of sqlite3_column_text() against NULL in get_sql_string()
-    
-    The return value of sqlite3_column_text() was not checked and passed
-    directly to strdup() causing a SIGSEV from libc. This patch ensure that
-    a NULL returned value will not be given to strdup().
-
-diff --git libpkg/pkgdb.c libpkg/pkgdb.c
-index 7140a69..7a2c706 100644
---- libpkg/pkgdb.c
-+++ libpkg/pkgdb.c
-@@ -2413,8 +2413,11 @@ get_sql_string(sqlite3 *s, const char *sql, char **res)
- 
- 	ret = sqlite3_step(stmt);
- 
--	if (ret == SQLITE_ROW)
--		*res = strdup(sqlite3_column_text(stmt, 0));
-+	if (ret == SQLITE_ROW) {
-+		const unsigned char *tmp;
-+		tmp = sqlite3_column_text(stmt, 0);
-+		*res = (tmp == NULL ? NULL : strdup(tmp));
-+	}
- 
- 	if (ret == SQLITE_DONE)
- 		*res = NULL;
diff --git a/ports-mgmt/pkg/pkg-descr b/ports-mgmt/pkg/pkg-descr
index 2c30b8d2b511..e888837d15a3 100644
--- a/ports-mgmt/pkg/pkg-descr
+++ b/ports-mgmt/pkg/pkg-descr
@@ -1,3 +1,3 @@
 New Generation package management tool for FreeBSD
 
-WWW:	http://wiki.freebsd.org/pkgng
+WWW: http://wiki.freebsd.org/pkgng