From owner-svn-ports-head@FreeBSD.ORG Wed Nov 6 16:24:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9E6189A2; Wed, 6 Nov 2013 16:24:11 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7CBE52AE6; Wed, 6 Nov 2013 16:24:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA6GOBeT048557; Wed, 6 Nov 2013 16:24:11 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6GOAl2048554; Wed, 6 Nov 2013 16:24:10 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201311061624.rA6GOAl2048554@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 6 Nov 2013 16:24:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333010 - in head/ports-mgmt/pkg-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Nov 2013 16:24:11 -0000 Author: bapt Date: Wed Nov 6 16:24:10 2013 New Revision: 333010 URL: http://svnweb.freebsd.org/changeset/ports/333010 Log: Update to pkg 1.2.0 b1 Changes: - Bug fixes in zsh completion - Lots of bug fixes discovered by Coverity Scan - New debug level traces - Auto upgrade of pkg(8) now restart the upgrade process automatically - Dependencies on library is now automatic via pkg register and pkg create - YAML is replaced by UCL format: Both formats are really simular. pkg(8) will falls back on parsing YAML when the UCL parser fail. And will emit a warning to the user showing a syntax that is compatible with both YAML and UCL. More informations on UCL: https://github.com/vstakhov/libucl - Do not generate catalogs in pkg 1.0 format anymore. - Working ssh protocol supported for repositories - New PKG_SSH_ARGS to allow passing custom arguments to ssh command used for the ssh:// protocol - Allow using '?' operator in pkg query expressions - New git like aliases to allow creating custom commands - REPO_DIR is now a list instead of a simple string - packagesite in pkg.conf is deprecated in favour using dedicated repository configuration files - New 'fingerprint' kind of signature: if a repository is declared using the fingerprint type of signature, a fingerprint directory should also be provided. Inside that fingerprint directory should be 2 directories: trusted and revoked. Those directories will contains files (in yaml/ucl format) containing the fingerprint of the trusted certificated and the revoked ones: --- begins -- function: sha256 fingerprint: an_hex_representation_of_the_fingerprint --- ends --- All unknown attribute will be silently ignored to allow extending in the future. It also support multiple signatures inside the catalog. the catalog should provide the signature in the following form: name.sig name.cert - pkg add is now able to read the packages from a pipe or a non-regular file '-' is an alias for stdin, this also works from pipes, fifos, unix domain sockets etc. - Support for pkg+foo url scheme where foo can be (http, https, ftp). - pkg info now default on glob matching - Print a pkg name only once - even if multiple vulns were found - when using -q - Accept empty/comment only configuration files - vuxml is now the default source for pkg audir - expat is now bundled (for vuxml) - pkg info -q is now equivalent of pkg info -qa - in case pkg info is querying a file or is a single direct match query then default on -f - pkg repo can now take new arguments: pkg repo [path] [rsa_key|'signing_command: '] This allow calling external command to perform the signing and pass the checksum to be signed in the command stdin. - options can now have a description - new pkg config subcommand to allow direct query of options - ABI is now checked again using globs: a 'noarch' package should just specify: ARCH: 'freebsd:*' a package working on both i386 and amd64: ARCH: 'freebsd:9:x86:*' - Broken incremental pkg repo support was removed. - Lots of spelling/grammar fixes - Properly support srv priority/weigh when ordering mirrors - Use port specified in the SRV entries to connect to a given mirror - New pkg bootstrap subcommand that is the counter part of the pkg(7) bootstrap subcommand - Allow ARCH to be printed by pkg info - Allow to hook plugins, before closing the local db if it was opened in RW mode - Improved build system Deleted: head/ports-mgmt/pkg-devel/files/ Modified: head/ports-mgmt/pkg-devel/Makefile head/ports-mgmt/pkg-devel/distinfo head/ports-mgmt/pkg-devel/pkg-plist Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Wed Nov 6 16:21:01 2013 (r333009) +++ head/ports-mgmt/pkg-devel/Makefile Wed Nov 6 16:24:10 2013 (r333010) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.1.4 -PORTREVISION= 8 +DISTVERSION= 1.2.0.b1 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -20,52 +19,14 @@ USE_XZ= yes # With no dependency at all NO_CCACHE= yes USE_LDCONFIG= yes -MANCOMPRESSED= yes +USES= uidfix MAKE_ENV+= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \ PORTREVISION=${PORTREVISION} -USE_STAGE= yes # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes -MAN8= pkg.8 \ - pkg-add.8 \ - pkg-annotate.8 \ - pkg-autoremove.8 \ - pkg-audit.8 \ - pkg-backup.8 \ - pkg-check.8 \ - pkg-clean.8 \ - pkg-convert.8 \ - pkg-create.8 \ - pkg-delete.8 \ - pkg-fetch.8 \ - pkg-info.8 \ - pkg-install.8 \ - pkg-lock.8 \ - pkg-query.8 \ - pkg-register.8 \ - pkg-repo.8 \ - pkg-rquery.8 \ - pkg-search.8 \ - pkg-set.8 \ - pkg-shell.8 \ - pkg-shlib.8 \ - pkg-stats.8 \ - pkg-update.8 \ - pkg-updating.8 \ - pkg-upgrade.8 \ - pkg-version.8 \ - pkg-which.8 -MAN5= pkg.conf.5 \ - pkg-repository.5 -MAN3= pkg_printf.3 -MLINKS= pkg-delete.8 pkg-remove.8 \ - pkg-lock.8 pkg-unlock.8 \ - pkg.8 pkg-static.8 - -NO_STAGE= yes .include .if defined(WITH_PKGNG) @@ -114,7 +75,7 @@ LATEST_LINK= pkg-devel PKG_DEPENDS= .undef INSTALLS_DEPENDS .if !exists(${LOCALBASE}/sbin/pkg) -PKG_BIN= ${WRKSRC}/pkg-static/pkg-static +PKG_BIN= ${WRKSRC}/pkg/pkg-static .endif .endif @@ -123,7 +84,6 @@ PERIODIC_SECURITY= 410.pkg-audit 460.pkg PERIODIC_ALL= ${PERIODIC_DAILY} ${PERIODIC_SECURITY} post-install: - @${INSTALL_DATA} ${WRKSRC}/pkg/pkg.conf.sample ${PREFIX}/etc - @${CAT} ${PKGMESSAGE} + @${INSTALL_DATA} ${WRKSRC}/pkg/pkg.conf.sample ${STAGEDIR}${PREFIX}/etc .include Modified: head/ports-mgmt/pkg-devel/distinfo ============================================================================== --- head/ports-mgmt/pkg-devel/distinfo Wed Nov 6 16:21:01 2013 (r333009) +++ head/ports-mgmt/pkg-devel/distinfo Wed Nov 6 16:24:10 2013 (r333010) @@ -1,2 +1,2 @@ -SHA256 (pkg-1.1.4.tar.xz) = d84c9052f18c9d64cb369b9f3e8c1542f79f1152032169b1d28fbc2308c2dcbd -SIZE (pkg-1.1.4.tar.xz) = 1554804 +SHA256 (pkg-1.2.0.b1.tar.xz) = e684525444a99d1f6dde5ba4eec42c293b4dc0b79bdfb67deb53325dc9639941 +SIZE (pkg-1.2.0.b1.tar.xz) = 1787496 Modified: head/ports-mgmt/pkg-devel/pkg-plist ============================================================================== --- head/ports-mgmt/pkg-devel/pkg-plist Wed Nov 6 16:21:01 2013 (r333009) +++ head/ports-mgmt/pkg-devel/pkg-plist Wed Nov 6 16:24:10 2013 (r333010) @@ -1,19 +1,54 @@ -etc/pkg.conf.sample -sbin/pkg -sbin/pkg-static -sbin/pkg2ng -include/pkg.h -lib/libpkg.so.1 -lib/libpkg.so -lib/libpkg.a -etc/periodic/daily/400.status-pkg +etc/bash_completion.d/_pkg.bash etc/periodic/daily/411.pkg-backup etc/periodic/daily/490.status-pkg-changes etc/periodic/security/410.pkg-audit etc/periodic/security/460.pkg-checksum +etc/periodic/weekly/400.status-pkg +etc/pkg.conf.sample +include/pkg.h +lib/libpkg.a +lib/libpkg.so +lib/libpkg.so.1 libdata/pkgconfig/pkg.pc +man/man3/pkg_printf.3.gz +man/man5/pkg-repository.5.gz +man/man5/pkg.conf.5.gz +man/man8/pkg-add.8.gz +man/man8/pkg-annotate.8.gz +man/man8/pkg-audit.8.gz +man/man8/pkg-autoremove.8.gz +man/man8/pkg-backup.8.gz +man/man8/pkg-check.8.gz +man/man8/pkg-clean.8.gz +man/man8/pkg-convert.8.gz +man/man8/pkg-create.8.gz +man/man8/pkg-delete.8.gz +man/man8/pkg-fetch.8.gz +man/man8/pkg-info.8.gz +man/man8/pkg-install.8.gz +man/man8/pkg-lock.8.gz +man/man8/pkg-query.8.gz +man/man8/pkg-register.8.gz +man/man8/pkg-remove.8.gz +man/man8/pkg-repo.8.gz +man/man8/pkg-rquery.8.gz +man/man8/pkg-search.8.gz +man/man8/pkg-set.8.gz +man/man8/pkg-shell.8.gz +man/man8/pkg-shlib.8.gz +man/man8/pkg-static.8.gz +man/man8/pkg-stats.8.gz +man/man8/pkg-unlock.8.gz +man/man8/pkg-update.8.gz +man/man8/pkg-updating.8.gz +man/man8/pkg-upgrade.8.gz +man/man8/pkg-version.8.gz +man/man8/pkg-which.8.gz +man/man8/pkg.8.gz +sbin/pkg +sbin/pkg-static +sbin/pkg2ng share/zsh/site-functions/_pkg -etc/bash_completion.d/_pkg.bash @dirrmtry etc/bash_completion.d @dirrmtry etc/periodic/daily @dirrmtry etc/periodic/security