From owner-svn-src-head@freebsd.org Sat Aug 4 22:31:30 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E0CF1055C2F; Sat, 4 Aug 2018 22:31:30 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 143CB8C110; Sat, 4 Aug 2018 22:31:30 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E995D15A39; Sat, 4 Aug 2018 22:31:29 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w74MVTLF072134; Sat, 4 Aug 2018 22:31:29 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w74MVTsi072132; Sat, 4 Aug 2018 22:31:29 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201808042231.w74MVTsi072132@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Sat, 4 Aug 2018 22:31:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r337339 - in head: etc usr.sbin/portsnap/portsnap X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head: etc usr.sbin/portsnap/portsnap X-SVN-Commit-Revision: 337339 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Aug 2018 22:31:30 -0000 Author: brd Date: Sat Aug 4 22:31:29 2018 New Revision: 337339 URL: https://svnweb.freebsd.org/changeset/base/337339 Log: Move portsnap.conf to head/usr.sbin/portsnap/portsnap/ This is prep for pkgbase to have config files tagged as such. Approved by: will (mentor) Differential Revision: https://reviews.freebsd.org/D16554 Added: head/usr.sbin/portsnap/portsnap/portsnap.conf - copied unchanged from r337338, head/etc/portsnap.conf Deleted: head/etc/portsnap.conf Modified: head/etc/Makefile head/usr.sbin/portsnap/portsnap/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sat Aug 4 22:25:41 2018 (r337338) +++ head/etc/Makefile Sat Aug 4 22:31:29 2018 (r337339) @@ -107,10 +107,6 @@ SSH= ${SRCTOP}/crypto/openssh/ssh_config \ SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf .endif -.if ${MK_PORTSNAP} != "no" -BIN1+= portsnap.conf -.endif - .if ${MK_PF} != "no" BIN1+= pf.os .endif Modified: head/usr.sbin/portsnap/portsnap/Makefile ============================================================================== --- head/usr.sbin/portsnap/portsnap/Makefile Sat Aug 4 22:25:41 2018 (r337338) +++ head/usr.sbin/portsnap/portsnap/Makefile Sat Aug 4 22:31:29 2018 (r337339) @@ -1,5 +1,6 @@ # $FreeBSD$ +CONFS= portsnap.conf SCRIPTS=portsnap.sh MAN= portsnap.8 Copied: head/usr.sbin/portsnap/portsnap/portsnap.conf (from r337338, head/etc/portsnap.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/portsnap/portsnap/portsnap.conf Sat Aug 4 22:31:29 2018 (r337339, copy of r337338, head/etc/portsnap.conf) @@ -0,0 +1,35 @@ +# $FreeBSD$ + +# Default directory where compressed snapshots are stored. +# WORKDIR=/var/db/portsnap + +# Default location of the ports tree (target for "update" and "extract"). +# PORTSDIR=/usr/ports + +# Server or server pool from which to fetch updates. You can change +# this to point at a specific server if you want, but in most cases +# using a "nearby" server won't provide a measurable improvement in +# performance. +SERVERNAME=portsnap.FreeBSD.org + +# Trusted keyprint. Changing this is a Bad Idea unless you've received +# a PGP-signed email from telling you to +# change it and explaining why. +KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddbd64f13f978f2f3aede40c98633216c330 + +# Example of ignoring parts of the ports tree. If you know that you +# absolutely will not need certain parts of the tree, this will save +# some bandwidth and disk space. See the manual page for more details. +# +# WARNING: Working with an incomplete ports tree is not supported and +# can cause problems due to missing dependencies. If you have REFUSE +# directives and experience problems, remove them and update your tree +# before asking for help on the mailing lists. +# +# REFUSE arabic chinese french german hebrew hungarian japanese +# REFUSE korean polish portuguese russian ukrainian vietnamese + +# List of INDEX files to build and the DESCRIBE file to use for each +#INDEX INDEX-10 DESCRIBE.10 +#INDEX INDEX-11 DESCRIBE.11 +INDEX INDEX-12 DESCRIBE.12