From owner-svn-ports-all@FreeBSD.ORG Wed Jul 23 14:22:10 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7C09CAFF; Wed, 23 Jul 2014 14:22:10 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 689792131; Wed, 23 Jul 2014 14:22:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6NEMA1C088337; Wed, 23 Jul 2014 14:22:10 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6NEM9t2088333; Wed, 23 Jul 2014 14:22:09 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201407231422.s6NEM9t2088333@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 23 Jul 2014 14:22:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362699 - in head/ports-mgmt/pkg: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jul 2014 14:22:10 -0000 Author: bapt Date: Wed Jul 23 14:22:09 2014 New Revision: 362699 URL: http://svnweb.freebsd.org/changeset/ports/362699 QAT: https://qat.redports.org/buildarchive/r362699/ Log: Update to 1.3.0 Since pkg 1.2: - 373 files changed, 66973 insertions(+), 38512 deletions(-) - 29 differents contributors - Merge of one of the 2013 Summer of code project Changelog: - New solver that can support external solvers using the CUDF format and the internal SAT solver - pkg-ssh(8) is now sandboxed with capsicum if it is available - pkg-ssh(8) now uses poll(2) - Remove StringList usage to improve portability - Rework the build system to use autotools to help portability - Now fetching is done to a temporary location and cleaned up if it fails - Remove PACKAGESITE - pkg-audit: remove support for portaudit compact database (only VulnXML will be used) - Improved UI experience based on jmmv write up (http://julipedia.meroh.net/search/label/cli-design) - Reworking the database locking mechanism into a finer grain and more clever system - Dynamic conflict handling if a conflict on files is detected at the sanity check level, try to solve the problem again with the new conflict information - Fix %t (timestamp) modifier in pkg_printf(3) - Full output now has a new field "date installed" - New pkg -o A=B to overwrite configuration from command line without the need of defining environment variables - pkg-install now can handle local files - pkg-add is now an alias on pkg-install - Simplify API by using more and more libucl objects (hidden behind an opaque 'pkg_object') - Rework multirepository handling - Prepare code for repository abstraction support - Sandbox signature checking and extraction - Support long options - Rework the extraction process - unicity of a package is now origin~name allowing subpackages and flavours - Improve ui for all commands - pkg lock -l now list the locked packages - symlinks now has a checksum to ensure they are valid - pkg backups generated by the distributed script are now plain sql files - Tons of bugfixes - Tons of behavour fixes Added: head/ports-mgmt/pkg/files/extra-patch-docs_pkg.8 (contents, props changed) Deleted: head/ports-mgmt/pkg/files/extra-patch-pkg_pkg.8 head/ports-mgmt/pkg/files/patch-libpkg__pkg_elf.c head/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c head/ports-mgmt/pkg/files/patch-rquery-I head/ports-mgmt/pkg/files/patch-scripts__periodic__Makefile head/ports-mgmt/pkg/files/patch-versionscript Modified: head/ports-mgmt/pkg/Makefile head/ports-mgmt/pkg/distinfo head/ports-mgmt/pkg/pkg-plist Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Wed Jul 23 14:12:35 2014 (r362698) +++ head/ports-mgmt/pkg/Makefile Wed Jul 23 14:22:09 2014 (r362699) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.2.7 -PORTREVISION= 4 +DISTVERSION= 1.3.0 CATEGORIES= ports-mgmt MASTER_SITES= \ http://files.etoilebsd.net/${PORTNAME}/ \ @@ -20,17 +19,16 @@ USES= tar:xz uidfix # With no dependency at all NO_CCACHE= yes USE_LDCONFIG= yes -MAKE_ARGS+= PKG_PORTSDIR=${PORTSDIR} - -MAKE_ENV+= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \ - PORTREVISION=${PORTREVISION} NO_PIE=yes +USES= libtool tar:xz +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes .if !exists(/usr/include/jail.h) -EXTRA_PATCHES= ${FILESDIR}/extra-patch-pkg_pkg.8 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .endif .include @@ -81,15 +79,12 @@ pre-everything:: PKG_DEPENDS= .undef INSTALLS_DEPENDS .if !exists(${LOCALBASE}/sbin/pkg) -PKG_BIN= ${WRKSRC}/pkg/pkg-static +PKG_BIN= ${WRKSRC}/src/pkg-static .endif .endif -PERIODIC_DAILY= 400.status-pkg 411.pkg-backup 490.status-pkg-changes -PERIODIC_SECURITY= 410.pkg-audit 460.pkg-checksum -PERIODIC_ALL= ${PERIODIC_DAILY} ${PERIODIC_SECURITY} - post-install: - @${INSTALL_DATA} ${WRKSRC}/pkg/pkg.conf.sample ${STAGEDIR}${PREFIX}/etc + @${MV} ${STAGEDIR}${PREFIX}/lib/libpkg_static.a \ + ${STAGEDIR}${PREFIX}/lib/libpkg.a .include Modified: head/ports-mgmt/pkg/distinfo ============================================================================== --- head/ports-mgmt/pkg/distinfo Wed Jul 23 14:12:35 2014 (r362698) +++ head/ports-mgmt/pkg/distinfo Wed Jul 23 14:22:09 2014 (r362699) @@ -1,2 +1,2 @@ -SHA256 (pkg-1.2.7.tar.xz) = 450f51a4c6e3d05fac9b0e408e5dfe252ac87abe72481a5b4711f077178ba4c1 -SIZE (pkg-1.2.7.tar.xz) = 1822868 +SHA256 (pkg-1.3.0.tar.xz) = 6d3001cdd605e6e3c15e686370cbeea999a5f19e72fd7f26e8af92ed2e2c2a01 +SIZE (pkg-1.3.0.tar.xz) = 1729104 Added: head/ports-mgmt/pkg/files/extra-patch-docs_pkg.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/extra-patch-docs_pkg.8 Wed Jul 23 14:22:09 2014 (r362699) @@ -0,0 +1,34 @@ +--- docs/pkg.8.orig 2014-06-19 12:43:52.000000000 +0000 ++++ docs/pkg.8 +@@ -30,7 +30,7 @@ + .Op Fl d + .Op Fl l + .Op Fl N +-.Op Fl j Ao jail name or id Ac | Fl c Ao chroot path Ac ++.Op Fl c Ao chroot path Ac + .Op Fl C Ao configuration file Ac + .Op Fl R Ao repository configuration directory Ac + .Ao command Ac Ao Ar flags Ac +@@ -146,22 +146,6 @@ is installed and activated: + # pkg_install-specifics + fi + .Ed +-.It Fl j Ao jail name or id Ac , Cm --jail Ao jail name or id Ac +-.Nm +-will execute in the given +-.Ao jail name or id Ac , +-where +-.Em name +-matches +-.Dq Cm jls Ar name +-and +-.Em id +-matches +-.Dq Cm jls Ar jid . +-See +-.Xr jail 8 +-and +-.Xr jls 8 . + .It Fl c Ao chroot path Ac , Cm --chroot Ao chroot path Ac + .Nm + will chroot in the Modified: head/ports-mgmt/pkg/pkg-plist ============================================================================== --- head/ports-mgmt/pkg/pkg-plist Wed Jul 23 14:12:35 2014 (r362698) +++ head/ports-mgmt/pkg/pkg-plist Wed Jul 23 14:22:09 2014 (r362699) @@ -8,7 +8,8 @@ etc/pkg.conf.sample include/pkg.h lib/libpkg.a lib/libpkg.so -lib/libpkg.so.1 +lib/libpkg.so.3 +lib/libpkg.so.3.0.0 libdata/pkgconfig/pkg.pc man/man3/pkg_printf.3.gz man/man3/pkg_repos.3.gz @@ -38,6 +39,7 @@ 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-ssh.8.gz man/man8/pkg-static.8.gz man/man8/pkg-stats.8.gz man/man8/pkg-unlock.8.gz @@ -50,7 +52,7 @@ man/man8/pkg.8.gz sbin/pkg sbin/pkg-static sbin/pkg2ng -share/zsh/site-functions/_pkg +share/zsh/site-functions/_pkg.zsh @dirrmtry etc/bash_completion.d @dirrmtry etc/periodic/daily @dirrmtry etc/periodic/security