diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-04-01 22:24:56 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-04-01 22:24:56 +0000 |
commit | 5f4b8f7e80696feaddd116eb6182b706125b1bfd (patch) | |
tree | 5a3e507d443c454c7991f33ec7951af8d3fa3afc /ports-mgmt | |
parent | Missed two occurences of ${PORTSDIR}/. (diff) |
Update to pkg 1.7.0
Changes:
- Support new "vital" notion: prevent from implicit deletion
- Improved support for OpenBSD/bitrig (still lacks some functions in libc)
- Improved ZSH completion
- Updated libucl
- Lots of fixes in error messages
- Fixed "pkg lock" handling
- Allow to specify "inline" respositories in pkg.conf
- ipv6 fixes
- Allow to restrict the accepted url schemes
- More commands supports "-q"
- Multiple bug fixes
- As usual multiple new bugs
- Improved support for shlibs dependency generation when packaging base via ALLOW_BASE_SHLIBES
Notes
Notes:
svn path=/head/; revision=412376
Diffstat (limited to 'ports-mgmt')
-rw-r--r-- | ports-mgmt/pkg/Makefile | 5 | ||||
-rw-r--r-- | ports-mgmt/pkg/distinfo | 4 | ||||
-rw-r--r-- | ports-mgmt/pkg/files/0001-Fix-installation-of-hardlinks.patch | 77 |
3 files changed, 3 insertions, 83 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index fe9abd72d106..d7dac360ac35 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.6.4 -PORTREVISION= 1 +DISTVERSION= 1.7.0 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ @@ -30,8 +29,6 @@ CFLAGS+= -Wno-error EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .endif -EXTRA_PATCHES+= ${FILESDIR}/0001-Fix-installation-of-hardlinks.patch - .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index 67d9de038003..57080bbd6a95 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,2 +1,2 @@ -SHA256 (pkg-1.6.4.tar.xz) = edb2d7212ac0149949dcebc08c2c15793589eaafddf097a2fca5ace25434758e -SIZE (pkg-1.6.4.tar.xz) = 1928740 +SHA256 (pkg-1.7.0.tar.xz) = 967394ebc08924b452f2efa0a1b993b81fa868ce70dbc0764280979c6e6942d8 +SIZE (pkg-1.7.0.tar.xz) = 1908468 diff --git a/ports-mgmt/pkg/files/0001-Fix-installation-of-hardlinks.patch b/ports-mgmt/pkg/files/0001-Fix-installation-of-hardlinks.patch deleted file mode 100644 index 14cf4aec2755..000000000000 --- a/ports-mgmt/pkg/files/0001-Fix-installation-of-hardlinks.patch +++ /dev/null @@ -1,77 +0,0 @@ -commit 34f3802a9e68f60e54671dca159c9e788063e291 -Author: Vsevolod Stakhov <vsevolod@highsecure.ru> -Date: Tue Feb 23 11:08:32 2016 +0000 - - Fix installation of hardlinks - - In case of hardlinks, `pathname` var was incorrectly restored from `rpath` - which is intended to be a temporary name. Hence, renaming was meaningless - afterwards. - - Issue: #1394 - Reported by: many - -diff --git libpkg/pkg_add.c libpkg/pkg_add.c -index adabb59..497e0fb 100644 ---- libpkg/pkg_add.c -+++ libpkg/pkg_add.c -@@ -1,8 +1,9 @@ - /*- - * Copyright (c) 2011-2013 Baptiste Daroussin <bapt@FreeBSD.org> - * Copyright (c) 2011-2012 Julien Laffaye <jlaffaye@FreeBSD.org> -+ * Copyright (c) 2016, Vsevolod Stakhov - * All rights reserved. -- * -+ * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: -@@ -12,7 +13,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * -+ * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -@@ -118,7 +119,7 @@ attempt_to_merge(bool renamed, struct pkg_config_file *rcf, - pkg_debug(3, "Empty configuration content for local package"); - return; - } -- -+ - pkg_debug(1, "Config file found %s", pathname); - file_to_buffer(pathname, &localconf, &sz); - -@@ -182,7 +183,7 @@ do_extract(struct archive *a, struct archive_entry *ae, const char *location, - int retcode = EPKG_OK; - int ret = 0, cur_file = 0; - char path[MAXPATHLEN], pathname[MAXPATHLEN], rpath[MAXPATHLEN]; -- char linkpath[MAXPATHLEN], bd[MAXPATHLEN], *cp; -+ char linkpath[MAXPATHLEN], tmppath[MAXPATHLEN], bd[MAXPATHLEN], *cp; - const char *lp; - struct stat st; - const struct stat *aest; -@@ -244,17 +245,16 @@ do_extract(struct archive *a, struct archive_entry *ae, const char *location, - - archive_entry_set_pathname(ae, rpath); - /* -- * Deal with hardlinks to rooted path. Use pathname as -- * temporary work space, restore it from rpath for use below. -+ * Deal with hardlinks to rooted path. Use tmppath as -+ * temporary work space - */ - lp = archive_entry_hardlink(ae); - if (lp != NULL) { - pkg_absolutepath(lp, linkpath, sizeof(linkpath)); -- snprintf(pathname, sizeof(pathname), "%s%s%s", -+ snprintf(tmppath, sizeof(tmppath), "%s%s%s", - location ? location : "", *linkpath == '/' ? "" : "/", - linkpath); -- archive_entry_set_hardlink(ae, pathname); -- strcpy(pathname, rpath); -+ archive_entry_set_hardlink(ae, tmppath); - } - - /* load in memory the content of config files */ |