From owner-svn-src-stable@freebsd.org Sat Sep 12 01:48:00 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EEE823EDA75; Sat, 12 Sep 2020 01:48:00 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BpFrJ642bz4BCP; Sat, 12 Sep 2020 01:48:00 +0000 (UTC) (envelope-from kevans@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 B36E3D4BE; Sat, 12 Sep 2020 01:48:00 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08C1m0Q7015899; Sat, 12 Sep 2020 01:48:00 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08C1lxGg015891; Sat, 12 Sep 2020 01:47:59 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202009120147.08C1lxGg015891@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sat, 12 Sep 2020 01:47:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365649 - in stable/12: libexec libexec/phttpget share/mk tools/build/mk usr.sbin/portsnap usr.sbin/portsnap/phttpget X-SVN-Group: stable-12 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/12: libexec libexec/phttpget share/mk tools/build/mk usr.sbin/portsnap usr.sbin/portsnap/phttpget X-SVN-Commit-Revision: 365649 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2020 01:48:01 -0000 Author: kevans Date: Sat Sep 12 01:47:59 2020 New Revision: 365649 URL: https://svnweb.freebsd.org/changeset/base/365649 Log: MFC r365490-r365491: Remove FREEBSD_UPDATE dependency on PORTSNAP r365490: phttpget: move out of portsnap Currently, WITHOUT_PORTSNAP forces WITHOUT_FREEBSD_UPDATE because the latter relies on phttpget, which lives inside the portsnap build bits. Remove the dependency between these two options by moving phttpget out into ^/libexec and building/installing it if either WITH_PORTSNAP or WITH_FREEBSD_UPDATE. Future work could remove the conditional if it's decided that users will use it independently of either the current in-base consumers. r365491: opts: FREEBSD_UPDATE no longer relies on PORTSNAP phttpget is no longer tied to the portsnap build as of r365490. Added: stable/12/libexec/phttpget/ - copied from r365491, head/libexec/phttpget/ Deleted: stable/12/usr.sbin/portsnap/phttpget/ Modified: stable/12/libexec/Makefile stable/12/share/mk/src.opts.mk stable/12/tools/build/mk/OptionalObsoleteFiles.inc stable/12/usr.sbin/portsnap/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/libexec/Makefile ============================================================================== --- stable/12/libexec/Makefile Sat Sep 12 00:33:11 2020 (r365648) +++ stable/12/libexec/Makefile Sat Sep 12 01:47:59 2020 (r365649) @@ -13,6 +13,7 @@ SUBDIR= ${_atf} \ ${_mail.local} \ ${_makewhatis.local} \ ${_mknetid} \ + ${_phttpget} \ ${_pppoed} \ rc \ revnetgroup \ @@ -46,6 +47,10 @@ SUBDIR+= bootpd .if ${MK_FINGER} != "no" SUBDIR+= fingerd +.endif + +.if ${MK_FREEBSD_UPDATE} != "no" || ${MK_PORTSNAP} != "no" +_phttpget= phttpget .endif .if ${MK_FTP} != "no" Modified: stable/12/share/mk/src.opts.mk ============================================================================== --- stable/12/share/mk/src.opts.mk Sat Sep 12 00:33:11 2020 (r365648) +++ stable/12/share/mk/src.opts.mk Sat Sep 12 01:47:59 2020 (r365649) @@ -527,11 +527,6 @@ MK_AUTHPF:= no MK_OFED_EXTRA:= no .endif -.if ${MK_PORTSNAP} == "no" -# freebsd-update depends on phttpget from portsnap -MK_FREEBSD_UPDATE:= no -.endif - .if ${MK_TESTS} == "no" MK_DTRACE_TESTS:= no .endif Modified: stable/12/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/12/tools/build/mk/OptionalObsoleteFiles.inc Sat Sep 12 00:33:11 2020 (r365648) +++ stable/12/tools/build/mk/OptionalObsoleteFiles.inc Sat Sep 12 01:47:59 2020 (r365649) @@ -2851,6 +2851,11 @@ OLD_FILES+=usr/share/man/man5/freebsd-update.conf.5.gz OLD_FILES+=usr/share/man/man8/freebsd-update.8.gz .endif +.if ${MK_FREEBSD_UPDATE} == no && ${MK_PORTSNAP} == no +OLD_FILES+=usr/libexec/phttpget +OLD_FILES+=usr/share/man/man8/phttpget.8.gz +.endif + .if ${MK_GAMES} == no OLD_FILES+=usr/bin/caesar OLD_FILES+=usr/bin/factor @@ -7870,10 +7875,8 @@ OLD_FILES+=usr/share/man/man8/pmcstudy.8.gz .if ${MK_PORTSNAP} == no OLD_FILES+=etc/portsnap.conf OLD_FILES+=usr/libexec/make_index -OLD_FILES+=usr/libexec/phttpget OLD_FILES+=usr/sbin/portsnap OLD_FILES+=usr/share/examples/etc/portsnap.conf -OLD_FILES+=usr/share/man/man8/phttpget.8.gz OLD_FILES+=usr/share/man/man8/portsnap.8.gz .endif Modified: stable/12/usr.sbin/portsnap/Makefile ============================================================================== --- stable/12/usr.sbin/portsnap/Makefile Sat Sep 12 00:33:11 2020 (r365648) +++ stable/12/usr.sbin/portsnap/Makefile Sat Sep 12 01:47:59 2020 (r365649) @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= portsnap make_index phttpget +SUBDIR= portsnap make_index .include