From nobody Wed Jun 4 06:22:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bByDb2zLwz5xXf6; Wed, 04 Jun 2025 06:22:39 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bByDZ4dWsz44Cd; Wed, 04 Jun 2025 06:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749018158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zOIYLid0cicynCyv0gbh3yGypQc2QmJ0A4NNLPTHks=; b=pgionz+WDV98GZhZxXqw1ljVh+HHQ+iWwsmfqaUWAps86OZrSECve6HJsTrL6VuIWuA1GS nL6fH5YZBKlwmzxH6ZAac2ekGpyax6H2MIQywmEnHEV3CpT4VqDZhggmiCxLBF4W3vDjv1 dwtA4pmf5pn119eU3Z3ie0b6EAdjzc3ijaP97AU2pmEReQH9OeFc5YBcEozQdZYX1lmKLK fRiKHHxFk7IyDMhpuUxHiTGczODo/5TOGIzTej7KM0tSPuvGkecxoIesPN4dO/ZdRmDwQV UGGwyqSjKG0AdHQAmQ46aHIR8b9P9zbdcOXYSHpQVGnVK2zfdFT65E6TTqSxBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749018158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zOIYLid0cicynCyv0gbh3yGypQc2QmJ0A4NNLPTHks=; b=ypsdLMhDqBjuZ5lIOo1N5VKQG0S7bgkssXZXufmqfz7icFB/6ZNjrY+xAXmLK10waRjKnb LtLLplQmUopFUNKoxjAebYRiQiKCUDc5b3QAogkab1s0LvXQ/Qu6qaOaJTH/Xpha5dJ/GE WtpD+fYEfp5wgUrX0ijmaadiD0UmlSsQMjWpcSpge/4ry6866gke0cQcped4avJPgydBaZ Y7H7D0axyhFzXQ0+q8ZLhceMOv6ch6mHr6arGAXFyqWvizPqTt0llGa1jDbFbp3hO4hhRy BASiAXc+OQX9C8DsmaRWkFJn2FX3V1ciUrisKtOOz1Ex+0V5IrL6BoiPSAxzSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749018158; a=rsa-sha256; cv=none; b=oymftT04trSxVhWUybeIDcFf+2568LxmqFRktq/KwIeAj4jvpiJGCFaeyeSmvY+Qv1RRVT H62YPhtY3iwxb40S7Yzd9Yty/PcgJaUAN5oR7wlbt9AfEn1acgchbp+QBMded4QqJnzc79 6QW7GvN1K2+dDsRSqdWKN0Dhu4FQBwJVz2Euz1R80gRvqJh/JglKbeX8nBQIWHGg9hnhPS keNGKAKl1U+DOsFbZP9DIGp5pu7irVOvir0HTNRzxyd7mhNymAWg9l7q+g4j92L4pE0vBr PkOewgUmIoXQa83ZVjqsME4Rv4LBvPEwuVYiA1HQTCRXHlgWGaPwTVQtSJ8S5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bByDZ3LHsz1BTB; Wed, 04 Jun 2025 06:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5546McOM032129; Wed, 4 Jun 2025 06:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5546McJO032126; Wed, 4 Jun 2025 06:22:38 GMT (envelope-from git) Date: Wed, 4 Jun 2025 06:22:38 GMT Message-Id: <202506040622.5546McJO032126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 0ddc223c6d52 - main - OptionalObsoleteFiles.inc: add some now-optional rc.d scripts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ddc223c6d526d19c338ed2af0820a998cbcb93e Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=0ddc223c6d526d19c338ed2af0820a998cbcb93e commit 0ddc223c6d526d19c338ed2af0820a998cbcb93e Author: Lexi Winter AuthorDate: 2025-06-04 05:45:10 +0000 Commit: Lexi Winter CommitDate: 2025-06-04 05:45:10 +0000 OptionalObsoleteFiles.inc: add some now-optional rc.d scripts After f91d251b399a, some rc.d scripts are gated behind the src.conf knob for the services they start. Add them to OptionalObsoleteFiles.inc so they are properly removed when the knob is disabled. Fixes: f91d251b399a ("rc.d: move some rc scripts to their packages") Reviewed by: kevans, jhb Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50560 --- tools/build/mk/OptionalObsoleteFiles.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 5c598306e152..91f7154d892f 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2662,6 +2662,7 @@ OLD_FILES+=usr/share/man/man8/ippool.8.gz .if ${MK_IPFW} == no OLD_FILES+=etc/rc.d/ipfw +OLD_FILES+=etc/rc.d/natd OLD_FILES+=etc/periodic/security/500.ipfwdenied OLD_FILES+=etc/periodic/security/550.ipfwlimit OLD_FILES+=sbin/ipfw @@ -5575,6 +5576,7 @@ OLD_FILES+=usr/share/man/man1/genl.1.gz .endif .if ${MK_NIS} == no +OLD_FILES+=etc/rc.d/nisdomain OLD_FILES+=etc/rc.d/ypbind OLD_FILES+=etc/rc.d/ypldap OLD_FILES+=etc/rc.d/yppasswdd @@ -6654,6 +6656,9 @@ OLD_FILES+=etc/newsyslog.conf.d/pf.conf OLD_FILES+=etc/periodic/security/520.pfdenied OLD_FILES+=etc/pf.os OLD_FILES+=etc/rc.d/ftp-proxy +OLD_FILES+=etc/rc.d/pf +OLD_FILES+=etc/rc.d/pflog +OLD_FILES+=etc/rc.d/pfsync OLD_FILES+=sbin/pfctl OLD_FILES+=sbin/pflogd OLD_FILES+=usr/include/netpfil/pf/pf.h @@ -6843,6 +6848,7 @@ OLD_FILES+=usr/share/man/man8/pmcstudy.8.gz .if ${MK_PPP} == no OLD_FILES+=etc/newsyslog.conf.d/ppp.conf OLD_FILES+=etc/ppp/ppp.conf +OLD_FILES+=etc/rc.d/ppp OLD_FILES+=etc/syslog.d/ppp.conf OLD_DIRS+=etc/ppp OLD_FILES+=usr/sbin/ppp @@ -8997,6 +9003,9 @@ OLD_FILES+=etc/rc.d/zfs OLD_FILES+=etc/rc.d/zfsbe OLD_FILES+=etc/rc.d/zfsd OLD_FILES+=etc/rc.d/zfskeys +OLD_FILES+=etc/rc.d/zpool +OLD_FILES+=etc/rc.d/zpoolreguid +OLD_FILES+=etc/rc.d/zpoolupgrade OLD_FILES+=etc/rc.d/zvol OLD_FILES+=etc/devd/zfs.conf OLD_FILES+=etc/periodic/daily/404.status-zfs