From owner-svn-src-projects@FreeBSD.ORG Thu Mar 5 12:41:01 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9DA21DD; Thu, 5 Mar 2015 12:41:01 +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 A3AAAF41; Thu, 5 Mar 2015 12:41:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25Cf17x029113; Thu, 5 Mar 2015 12:41:01 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25Cf0gd029097; Thu, 5 Mar 2015 12:41:00 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503051241.t25Cf0gd029097@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 5 Mar 2015 12:41:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r279656 - in projects/release-pkg: etc etc/mtree etc/rc.d release/packages/unbound usr.sbin/unbound X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2015 12:41:01 -0000 Author: bapt Date: Thu Mar 5 12:40:59 2015 New Revision: 279656 URL: https://svnweb.freebsd.org/changeset/base/279656 Log: Make unbound an individual package Ensure we keep all tags from mtrees when creating the METALOG Added: projects/release-pkg/release/packages/unbound/ projects/release-pkg/release/packages/unbound/+MANIFEST Modified: projects/release-pkg/etc/Makefile projects/release-pkg/etc/mtree/BSD.var.dist projects/release-pkg/etc/rc.d/Makefile projects/release-pkg/usr.sbin/unbound/Makefile.inc Modified: projects/release-pkg/etc/Makefile ============================================================================== --- projects/release-pkg/etc/Makefile Thu Mar 5 12:39:18 2015 (r279655) +++ projects/release-pkg/etc/Makefile Thu Mar 5 12:40:59 2015 (r279656) @@ -269,7 +269,7 @@ distribution: ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} .if ${MK_UNBOUND} != "no" if [ ! -e ${DESTDIR}/etc/unbound ]; then \ - ${INSTALL_SYMLINK} ${TAG_ARGS} ../var/unbound ${DESTDIR}/etc/unbound; \ + ${INSTALL_SYMLINK} -T package=unbound ../var/unbound ${DESTDIR}/etc/unbound; \ fi .endif .if ${MK_SENDMAIL} != "no" @@ -377,12 +377,11 @@ distrib-dirs: ${MTREES:N/*} shift; \ d=$$1; \ test "$$d" == "/" && d=""; \ - d=$d; \ + d=$$d; \ shift; \ - test -d $$d || mkdir -p $$d; \ - ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \ + ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \ "sed s#^\.#.$$d# | ${METALOG.add}" ; \ - ${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \ + ${MTREE_CMD:N-W} -C -f $$m -K all | sed s#^\.#.$$d# | \ ${METALOG.add} ; \ done; true .endif Modified: projects/release-pkg/etc/mtree/BSD.var.dist ============================================================================== --- projects/release-pkg/etc/mtree/BSD.var.dist Thu Mar 5 12:39:18 2015 (r279655) +++ projects/release-pkg/etc/mtree/BSD.var.dist Thu Mar 5 12:40:59 2015 (r279656) @@ -97,8 +97,8 @@ vi.recover mode=01777 .. .. - unbound uname=unbound gname=unbound mode=0755 - conf.d uname=unbound gname=unbound mode=0755 + unbound uname=unbound gname=unbound mode=0755 tags=package=unbound + conf.d uname=unbound gname=unbound mode=0755 tags=package=unbound .. .. yp Modified: projects/release-pkg/etc/rc.d/Makefile ============================================================================== --- projects/release-pkg/etc/rc.d/Makefile Thu Mar 5 12:39:18 2015 (r279655) +++ projects/release-pkg/etc/rc.d/Makefile Thu Mar 5 12:40:59 2015 (r279656) @@ -2,6 +2,8 @@ .include +FILESGROUPS= FILES + FILES= DAEMON \ FILESYSTEMS \ LOGIN \ @@ -121,7 +123,6 @@ FILES= DAEMON \ tmp \ ${_ubthidhci} \ ugidfw \ - ${_unbound} \ ${_utx} \ var \ watchdogd \ @@ -268,7 +269,8 @@ FILES+= timed .endif .if ${MK_UNBOUND} != "no" -_unbound= local_unbound +FILESGROUPS+= UNBOUND +UNBOUND+= local_unbound .endif .if ${MK_UTMPX} != "no" @@ -287,4 +289,8 @@ FILES+= wpa_supplicant FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} +UNBOUNDDIR= /etc/rc.d +UNBOUNDMODE= ${BINMODE} +UNBOUNDPACKAGE= unbound + .include Added: projects/release-pkg/release/packages/unbound/+MANIFEST ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/unbound/+MANIFEST Thu Mar 5 12:40:59 2015 (r279656) @@ -0,0 +1,14 @@ +name = "FreeBSD-unbound" +origin = "base" +version = "%VERSION%" +comment = "Validating, recursive, and caching DNS resolver" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD4CLAUSE ] +desc = <